summaryrefslogtreecommitdiff
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
parentd1157238f9b70ef1ccc4fd25e32b584380aa7e7d (diff)
downloadgitlab-ce-7b523eb1a144fe87e4ce12c3a611b5648ebd93cb.tar.gz
Use ENABLE_SPRING to use it by defaultmake-spring-optional
-rw-r--r--Gemfile12
-rwxr-xr-xbin/spring2
2 files changed, 6 insertions, 8 deletions
diff --git a/Gemfile b/Gemfile
index e98dd4e9ea8..435bccaf04b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -294,6 +294,11 @@ group :development, :test do
gem 'teaspoon', '~> 1.1.0'
gem 'teaspoon-jasmine', '~> 2.2.0'
+ gem 'spring', '~> 1.7.0'
+ gem 'spring-commands-rspec', '~> 1.0.4'
+ gem 'spring-commands-spinach', '~> 1.1.0'
+ gem 'spring-commands-teaspoon', '~> 0.0.2'
+
gem 'rubocop', '~> 0.40.0', require: false
gem 'rubocop-rspec', '~> 1.5.0', require: false
gem 'scss_lint', '~> 0.47.0', require: false
@@ -321,13 +326,6 @@ group :production do
gem "gitlab_meta", '7.0'
end
-group :spring, optional: true do
- gem 'spring', '~> 1.7.0'
- gem 'spring-commands-rspec', '~> 1.0.4'
- gem 'spring-commands-spinach', '~> 1.1.0'
- gem 'spring-commands-teaspoon', '~> 0.0.2'
-end
-
gem "newrelic_rpm", '~> 3.14'
gem 'octokit', '~> 4.3.0'
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'