diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-12-28 14:52:43 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-12-28 14:52:43 -0600 |
| commit | c9d7514fd8d46b0de126fb9d6d081ec25bd3c5bb (patch) | |
| tree | 417386f11b8c9f44bfac861659603281d302f614 /bin/rspec | |
| parent | 77e1a9b0f8757109ca7f7a4398c46fe8d1d45dbe (diff) | |
| parent | e962baf4417e59cbb2ef8621ef0662f93f180f92 (diff) | |
| download | gitlab-ce-fix-popover-header-size.tar.gz | |
Merge branch 'master' into fix-popover-header-sizefix-popover-header-size
Diffstat (limited to 'bin/rspec')
| -rwxr-xr-x | bin/rspec | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/bin/rspec b/bin/rspec index b0770e30a70..4236753c9c1 100755 --- a/bin/rspec +++ b/bin/rspec @@ -1,10 +1,5 @@ #!/usr/bin/env ruby -# 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[0 false].include?(ENV["RAILS5"]) ? "Gemfile.rails4" : "Gemfile" -ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../#{gemfile}", __dir__) - begin load File.expand_path('../spring', __FILE__) rescue LoadError => e |