diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-04-11 00:55:02 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-04-11 00:55:02 +0100 |
| commit | 3f73bdd837f9803b75eca484a0a0615db6c58c80 (patch) | |
| tree | 0bd2c99d9198bfa22e7a29f375131f940033da7b /bin/spinach | |
| parent | b594ab949d1a2ceb9d949ff2641679fbdf273452 (diff) | |
| parent | 37a5632483b67ddcfa4c535cc911319b25f01fb5 (diff) | |
| download | gitlab-ce-xterm-npm.tar.gz | |
Merge branch 'master' into xterm-npmxterm-npm
Diffstat (limited to 'bin/spinach')
| -rwxr-xr-x | bin/spinach | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/spinach b/bin/spinach index 474050e29d1..eda81c9ed8a 100755 --- a/bin/spinach +++ b/bin/spinach @@ -1,4 +1,9 @@ #!/usr/bin/env ruby + +# Remove this block when removing rails5? code. +gemfile = %w[1 true].include?(ENV["RAILS5"]) ? "Gemfile.rails5" : "Gemfile" +ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../#{gemfile}", __dir__) + begin load File.expand_path('../spring', __FILE__) rescue LoadError => e |