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 /bin/rspec | |
| 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 'bin/rspec')
| -rwxr-xr-x | bin/rspec | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/rspec b/bin/rspec index 26583242051..b0770e30a70 100755 --- a/bin/rspec +++ b/bin/rspec @@ -2,7 +2,7 @@ # Remove these two lines below when upgraded to rails 5.0. # Allow run `rspec` command as `RAILS5=1 rspec ...` instead of `BUNDLE_GEMFILE=Gemfile.rails5 rspec ...` -gemfile = %w[1 true].include?(ENV["RAILS5"]) ? "Gemfile.rails5" : "Gemfile" +gemfile = %w[0 false].include?(ENV["RAILS5"]) ? "Gemfile.rails4" : "Gemfile" ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../#{gemfile}", __dir__) begin |