diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-11-07 21:09:42 +0100 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-11-14 12:41:16 +0100 |
| commit | 48b59620c1f17cae7c88db8d08bba502f47bd144 (patch) | |
| tree | 56800696ca441474b075157b695e49db05339113 /bin | |
| parent | cb5506565ca591e3c979350c38021e8b7ea03add (diff) | |
| download | gitlab-ce-48b59620c1f17cae7c88db8d08bba502f47bd144.tar.gz | |
Make rails5 defailt in bin/* scripts
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/rails | 2 | ||||
| -rwxr-xr-x | bin/rake | 2 | ||||
| -rwxr-xr-x | bin/rspec | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/bin/rails b/bin/rails index 228f812ccaf..d21b64b3007 100755 --- a/bin/rails +++ b/bin/rails @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # Remove this block when upgraded to rails 5.0. -unless %w[1 true].include?(ENV["RAILS5"]) +if %w[0 false].include?(ENV["RAILS5"]) begin load File.expand_path('../spring', __FILE__) rescue LoadError => e @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # Remove this block when upgraded to rails 5.0. -unless %w[1 true].include?(ENV["RAILS5"]) +if %w[0 false].include?(ENV["RAILS5"]) begin load File.expand_path('../spring', __FILE__) rescue LoadError => e 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 |