summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGabriel Mazetto <gabriel@gitlab.com>2016-03-03 17:08:16 -0300
committerGabriel Mazetto <gabriel@gitlab.com>2016-03-03 17:08:16 -0300
commit1ecefd3718f60731da6eb266115dbbb16df948b8 (patch)
treee76630355452f3661d019eac41c71d993c58f996 /Gemfile.lock
parentbd269eaab993c4f2faa03e0e3a5cef72a82d3f2b (diff)
downloadgitlab-ce-1ecefd3718f60731da6eb266115dbbb16df948b8.tar.gz
Update spring to 1.6.4 to fix support for Bundler 1.11
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 79b80c1fa35..bdf7dbfd157 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -763,7 +763,7 @@ GEM
capybara (>= 2.0.0)
railties (>= 3)
spinach (>= 0.4)
- spring (1.3.6)
+ spring (1.6.4)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
spring-commands-spinach (1.0.0)
@@ -1016,7 +1016,7 @@ DEPENDENCIES
six (~> 0.2.0)
slack-notifier (~> 1.2.0)
spinach-rails (~> 0.2.1)
- spring (~> 1.3.6)
+ spring (~> 1.6.4)
spring-commands-rspec (~> 1.0.4)
spring-commands-spinach (~> 1.0.0)
spring-commands-teaspoon (~> 0.0.2)