summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-29 17:39:18 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-29 17:39:18 +0300
commit3daef3dd51ad69ddad8d9b73c515fc335b75d6ac (patch)
tree6cc43b22c719719e03d3e5c807905b62796a5ca2 /Gemfile.lock
parentdae9faf340ae4227f1a956b388ca6ee9aee3f8e2 (diff)
parent0b5783119f9577ae6b7506836c384a541854979d (diff)
downloadgitlab-ce-3daef3dd51ad69ddad8d9b73c515fc335b75d6ac.tar.gz
Merge pull request #7517 from jvanbaarsen/guard-spring-fix
Updated the spring gem and fixed the guard file
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 205599e898c..edd30fda37a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -489,7 +489,7 @@ GEM
capybara (>= 2.0.0)
railties (>= 3)
spinach (>= 0.4)
- spring (1.1.1)
+ spring (1.1.3)
spring-commands-rspec (1.0.1)
spring (>= 0.9.1)
spring-commands-spinach (1.0.0)
@@ -676,7 +676,7 @@ DEPENDENCIES
slack-notifier (~> 0.3.2)
slim
spinach-rails
- spring (= 1.1.1)
+ spring (= 1.1.3)
spring-commands-rspec (= 1.0.1)
spring-commands-spinach (= 1.0.0)
stamp