diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-06-22 10:47:48 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-06-22 10:47:48 -0300 |
| commit | 2674b548601b279ada46d4b218a9def6fd5b9f6d (patch) | |
| tree | ca1f09225e4d5b80c800af521735bf34f04e16d0 /bin/spring | |
| parent | 8447c6b180297840d835a609d95808834f498d87 (diff) | |
| parent | 6f6c6f68ea7cb976b6c1598e705ba8b2bdaf05a1 (diff) | |
| download | gitlab-ce-2674b548601b279ada46d4b218a9def6fd5b9f6d.tar.gz | |
merge master into issue_3359_3
Diffstat (limited to 'bin/spring')
| -rwxr-xr-x | bin/spring | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/spring b/bin/spring index 7fe232c3aae..e0d140fe0c7 100755 --- a/bin/spring +++ b/bin/spring @@ -3,7 +3,7 @@ # This file loads spring without using Bundler, in order to be fast. # It gets overwritten when you run the `spring binstub` command. -unless defined?(Spring) +unless (defined?(Spring) || ENV['ENABLE_SPRING'] != '1') && File.basename($0) != 'spring' require 'rubygems' require 'bundler' |