summaryrefslogtreecommitdiff
path: root/bin/spring
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-17 16:40:28 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-17 16:54:55 +0200
commit7b523eb1a144fe87e4ce12c3a611b5648ebd93cb (patch)
treea28ddbe9c31142b3e5868dc3abf2ac7423769aef /bin/spring
parentd1157238f9b70ef1ccc4fd25e32b584380aa7e7d (diff)
downloadgitlab-ce-7b523eb1a144fe87e4ce12c3a611b5648ebd93cb.tar.gz
Use ENABLE_SPRING to use it by defaultmake-spring-optional
Diffstat (limited to 'bin/spring')
-rwxr-xr-xbin/spring2
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'