Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
fdcc5dde
Commit
fdcc5dde
authored
Jun 03, 2014
by
GitLab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure sidekiq is displayed by setting X-Frame-Options.
parent
f758438e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
CHANGELOG
CHANGELOG
+1
-0
lib/support/nginx/gitlab
lib/support/nginx/gitlab
+1
-0
No files found.
CHANGELOG
View file @
fdcc5dde
...
@@ -13,6 +13,7 @@ v 7.0.0
...
@@ -13,6 +13,7 @@ v 7.0.0
- Group masters can create projects in group
- Group masters can create projects in group
- Deprecate ruby 1.9.3 support
- Deprecate ruby 1.9.3 support
- Only masters can rewrite/remove git tags
- Only masters can rewrite/remove git tags
- Add X-Frame-Options SAMEORIGIN to Nginx config so Sidekiq admin is visible
v 6.9.2
v 6.9.2
- Revert the commit that broke the LDAP user filter
- Revert the commit that broke the LDAP user filter
...
...
lib/support/nginx/gitlab
View file @
fdcc5dde
...
@@ -54,6 +54,7 @@ server {
...
@@ -54,6 +54,7 @@ server {
proxy_set_header Host $http_host;
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Frame-Options SAMEORIGIN;
proxy_pass http://gitlab;
proxy_pass http://gitlab;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment