Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add X-Frame-Options header to nginx #1520

Merged
merged 4 commits into from
Jul 3, 2019
Merged

Conversation

J0WI
Copy link
Contributor

@J0WI J0WI commented Jul 1, 2019

J0WI added 3 commits July 1, 2019 22:29
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
@skjnldsv
Copy link
Member

skjnldsv commented Jul 2, 2019

Conflicts :)

@MorrisJobke MorrisJobke merged commit 2b322c5 into nextcloud:master Jul 3, 2019
@J0WI J0WI deleted the x-frame branch July 3, 2019 18:44
MichaIng added a commit that referenced this pull request Aug 24, 2019
+ Ref: #1520
+ The master merge to resolve conflicts has reverted the headers changes for the subdir config. This commit redoes the intended changes, to match Nginx webroot config and .htaccess.

Signed-off-by: Micha Felle <micha@dietpi.com>
backportbot-nextcloud bot pushed a commit that referenced this pull request Sep 23, 2019
+ Ref: #1520
+ The master merge to resolve conflicts has reverted the headers changes for the subdir config. This commit redoes the intended changes, to match Nginx webroot config and .htaccess.

Signed-off-by: Micha Felle <micha@dietpi.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants