summaryrefslogtreecommitdiff
path: root/config/application.rb
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2018-08-22 14:09:28 +0200
committerJan Provaznik <jprovaznik@gitlab.com>2018-11-14 12:38:30 +0100
commit547dc7ac600d3a8dfe61035fc35e82d11bea4aee (patch)
tree232d1a27c9f716ac4c17277ae542d7ccd3ff3ee9 /config/application.rb
parentc93439605bdad009754be70007c798b3d345e677 (diff)
downloadgitlab-ce-547dc7ac600d3a8dfe61035fc35e82d11bea4aee.tar.gz
Switch to Rails 5 by default
* updates Gemfile * uses Rails 5 unless explicitly disabled
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb2
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