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
Jérome Perrin
gitlab-ce
Commits
923a1f7a
Commit
923a1f7a
authored
Sep 29, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
parents
0a42c6a2
0ee03af8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
2 deletions
+13
-2
config/application.rb
config/application.rb
+13
-2
No files found.
config/application.rb
View file @
923a1f7a
...
@@ -99,13 +99,24 @@ module Gitlab
...
@@ -99,13 +99,24 @@ module Gitlab
config
.
action_view
.
sanitized_allowed_protocols
=
%w(smb)
config
.
action_view
.
sanitized_allowed_protocols
=
%w(smb)
config
.
middleware
.
use
Rack
::
Attack
config
.
middleware
.
insert_before
Warden
::
Manager
,
Rack
::
Attack
# Allow access to GitLab API from other domains
# Allow access to GitLab API from other domains
config
.
middleware
.
use
Rack
::
Cors
do
config
.
middleware
.
insert_before
Warden
::
Manager
,
Rack
::
Cors
do
allow
do
origins
Gitlab
.
config
.
gitlab
.
url
resource
'/api/*'
,
credentials:
true
,
headers: :any
,
methods: :any
,
expose:
[
'Link'
]
end
# Cross-origin requests must not have the session cookie available
allow
do
allow
do
origins
'*'
origins
'*'
resource
'/api/*'
,
resource
'/api/*'
,
credentials:
false
,
headers: :any
,
headers: :any
,
methods: :any
,
methods: :any
,
expose:
[
'Link'
]
expose:
[
'Link'
]
...
...
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