From 7b523eb1a144fe87e4ce12c3a611b5648ebd93cb Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 17 Jun 2016 16:40:28 +0200
Subject: Use ENABLE_SPRING to use it by default

---
 bin/spring | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/spring')

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'
 
-- 
cgit v1.2.3