diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-17 15:51:10 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-06-17 15:51:10 +0000 |
| commit | 6c292e90be711392beaba90bfd8c40079da0266b (patch) | |
| tree | b510b3d6eca0ae2461db31af2fb0e610f15c7d03 | |
| parent | 8c2697eaed73096cf56e6a5e1683008708580710 (diff) | |
| parent | 7b523eb1a144fe87e4ce12c3a611b5648ebd93cb (diff) | |
| download | gitlab-ce-6c292e90be711392beaba90bfd8c40079da0266b.tar.gz | |
Merge branch 'make-spring-optional' into 'master'
Make spring optional
Require to `ENABLE_SPRING=1` to use spring. This assumes that you use binstubs from `bin/` which is true in most cases.
cc @jacobvosmaer-gitlab
See merge request !4752
| -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' |