diff options
| author | Ahmad Hassan <ahmad.hassan612@gmail.com> | 2018-11-15 16:19:09 +0200 |
|---|---|---|
| committer | Ahmad Hassan <ahmad.hassan612@gmail.com> | 2018-11-15 16:19:09 +0200 |
| commit | 73b3da73d62b3b18b6552f2a99f86458d03d628a (patch) | |
| tree | ad65dac4757615ddb813f6152d4eb76ac14ebee4 /config/application.rb | |
| parent | ebc174e968ece65110aa722a18cdf437cfa75eeb (diff) | |
| parent | bf31bd0d82affc29963d7d15c850ae0a0cc362a3 (diff) | |
| download | gitlab-ce-73b3da73d62b3b18b6552f2a99f86458d03d628a.tar.gz | |
Merge remote-tracking branch 'origin/master' into support-gitaly-tls
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index 9074cf02c46..1b084e91cfb 100644 --- a/config/application.rb +++ b/config/application.rb @@ -8,7 +8,7 @@ module Gitlab # This method is used for smooth upgrading from the current Rails 4.x to Rails 5.0. # https://gitlab.com/gitlab-org/gitlab-ce/issues/14286 def self.rails5? - ENV["RAILS5"].in?(%w[1 true]) + !%w[0 false].include?(ENV["RAILS5"]) end class Application < Rails::Application @@ -144,7 +144,7 @@ module Gitlab config.assets.precompile << "errors.css" # Import gitlab-svgs directly from vendored directory - config.assets.paths << "#{config.root}/node_modules/@gitlab-org/gitlab-svgs/dist" + config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist" config.assets.precompile << "icons.svg" config.assets.precompile << "icons.json" config.assets.precompile << "illustrations/*.svg" |