diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-14 14:01:14 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-14 14:01:14 +0000 |
| commit | af3a73ef9c5a2035b9dea594b963c8029a9fd381 (patch) | |
| tree | d92cb6e8044ea1464e2e1c147d8ec270c1436818 /config/application.rb | |
| parent | 28e3a90be82ac4365195a2cd96095fbd5e1b5c2c (diff) | |
| parent | f6d368c74854be15b2783d8ff08e40f510e3d976 (diff) | |
| download | gitlab-ce-af3a73ef9c5a2035b9dea594b963c8029a9fd381.tar.gz | |
Merge branch 'switch-rails' into 'master'
Switch to Rails 5
Closes #14286 and #48991
See merge request gitlab-org/gitlab-ce!21492
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 95b0f74a5a3..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 |