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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
4878eae1
Commit
4878eae1
authored
Feb 02, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
disable webpack proxy in rspec environment due to conflicts with webmock gem
parent
cd6a6ff7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
12 deletions
+20
-12
config/initializers/static_files.rb
config/initializers/static_files.rb
+20
-12
No files found.
config/initializers/static_files.rb
View file @
4878eae1
...
...
@@ -16,15 +16,20 @@ if app.config.serve_static_files
# If webpack-dev-server is configured, proxy webpack's public directory
# instead of looking for static assets
if
Gitlab
.
config
.
webpack
.
dev_server
.
enabled
app
.
config
.
webpack
.
dev_server
.
merge!
(
dev_server
=
{
enabled:
true
,
host:
Gitlab
.
config
.
webpack
.
dev_server
.
host
,
port:
Gitlab
.
config
.
webpack
.
dev_server
.
port
,
manifest_host:
Gitlab
.
config
.
webpack
.
dev_server
.
host
,
manifest_port:
Gitlab
.
config
.
webpack
.
dev_server
.
port
,
}
if
Rails
.
env
.
development?
dev_server
.
merge!
(
host:
Gitlab
.
config
.
gitlab
.
host
,
port:
Gitlab
.
config
.
gitlab
.
port
,
https:
Gitlab
.
config
.
gitlab
.
https
,
manifest_host:
Gitlab
.
config
.
webpack
.
dev_server
.
host
,
manifest_port:
Gitlab
.
config
.
webpack
.
dev_server
.
port
,
)
app
.
config
.
middleware
.
insert_before
(
Gitlab
::
Middleware
::
Static
,
Gitlab
::
Middleware
::
WebpackProxy
,
...
...
@@ -33,4 +38,7 @@ if app.config.serve_static_files
proxy_port:
Gitlab
.
config
.
webpack
.
dev_server
.
port
,
)
end
app
.
config
.
webpack
.
dev_server
.
merge!
(
dev_server
)
end
end
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