Merge branch 'switch-rails' into 'master'

Switch to Rails 5

Closes #14286 and #48991

See merge request gitlab-org/gitlab-ce!21492

1 files changed, 1 insertions, 1 deletions

diff --git a/Gemfile b/Gemfile
index fdadea8c658..7030bd9c5e8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 # --- Special code for migrating to Rails 5.0 ---
 def rails5?
-  %w[1 true].include?(ENV["RAILS5"])
+  !%w[0 false].include?(ENV["RAILS5"])
 end
 
 gem_versions = {}