From f7abe46109c5e90ff2ac0a8f812ea43016b5c2bc Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 12 Aug 2016 21:58:28 +0200
Subject: [PATCH] Remove changes not related to this MR
---
Gemfile | 1 -
Gemfile.lock | 3 ---
bin/spring | 2 +-
3 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/Gemfile b/Gemfile
index 9bcfc0302b6..8b44b54e22c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -296,7 +296,6 @@ group :development, :test do
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'spring-commands-spinach', '~> 1.1.0'
gem 'spring-commands-teaspoon', '~> 0.0.2'
- gem "spring-commands-sidekiq"
gem 'rubocop', '~> 0.41.2', require: false
gem 'rubocop-rspec', '~> 1.5.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 4bd5b78a047..3ba6048143c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -696,8 +696,6 @@ GEM
spring (1.7.2)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
- spring-commands-sidekiq (1.0.0)
- spring (>= 0.9.1)
spring-commands-spinach (1.1.0)
spring (>= 0.9.1)
spring-commands-teaspoon (0.0.2)
@@ -957,7 +955,6 @@ DEPENDENCIES
spinach-rerun-reporter (~> 0.0.2)
spring (~> 1.7.0)
spring-commands-rspec (~> 1.0.4)
- spring-commands-sidekiq
spring-commands-spinach (~> 1.1.0)
spring-commands-teaspoon (~> 0.0.2)
sprockets (~> 3.6.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'
--
GitLab