diff options
author | Robert Speicher <robert@gitlab.com> | 2017-05-10 21:43:34 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-05-10 21:43:34 +0000 |
commit | cb2f739d4844af094f62edb4e4dff1b3413a405b (patch) | |
tree | c86ea111756a89d84e0601d554ddc78d3be780d0 /config/initializers/static_files.rb | |
parent | 000045e6647fd8c2e28b1a6dc12ce59f9bfc054f (diff) | |
parent | 3db37e05622aa3daa2be41bb9edc486cd2e54bcd (diff) | |
download | gitlab-ce-cb2f739d4844af094f62edb4e4dff1b3413a405b.tar.gz |
Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'master'
Resolve "Use consistent style for trailing commas"
Closes #27144
See merge request !11063
Diffstat (limited to 'config/initializers/static_files.rb')
-rw-r--r-- | config/initializers/static_files.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/static_files.rb b/config/initializers/static_files.rb index 74aba6c5d06..9ed96ddb0b4 100644 --- a/config/initializers/static_files.rb +++ b/config/initializers/static_files.rb @@ -23,21 +23,21 @@ if app.config.serve_static_files host: dev_server.host, port: dev_server.port, manifest_host: dev_server.host, - manifest_port: dev_server.port, + manifest_port: dev_server.port } if Rails.env.development? settings.merge!( host: Gitlab.config.gitlab.host, port: Gitlab.config.gitlab.port, - https: Gitlab.config.gitlab.https, + https: Gitlab.config.gitlab.https ) app.config.middleware.insert_before( Gitlab::Middleware::Static, Gitlab::Middleware::WebpackProxy, proxy_path: app.config.webpack.public_path, proxy_host: dev_server.host, - proxy_port: dev_server.port, + proxy_port: dev_server.port ) end |