summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-16 11:24:26 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-16 11:24:26 +0200
commit4bbb3d5510d5396eca034a9a8593952b16b15ab5 (patch)
treeac1676fc75e673248732ae6ca35aa26e9529eefa /Gemfile.lock
parent242cf70a0d1f1522b85b2f66af056c1963aa8352 (diff)
parent5a68db91c8a2ae7d23b07a5c52b8b74d859a819f (diff)
downloadgitlab-ce-4bbb3d5510d5396eca034a9a8593952b16b15ab5.tar.gz
Merge pull request #6333 from jvanbaarsen/added-spring
Added spring to the project
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock8
1 files changed, 8 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 2c99063726e..91d04e2ec70 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -470,6 +470,11 @@ GEM
railties (>= 3)
spinach (>= 0.4)
spork (1.0.0rc4)
+ spring (1.1.1)
+ spring-commands-rspec (1.0.1)
+ spring (>= 0.9.1)
+ spring-commands-spinach (1.0.0)
+ spring (>= 0.9.1)
sprockets (2.10.1)
hike (~> 1.2)
multi_json (~> 1.0)
@@ -637,6 +642,9 @@ DEPENDENCIES
slim
spinach-rails
spork (~> 1.0rc)
+ spring (= 1.1.1)
+ spring-commands-rspec (= 1.0.1)
+ spring-commands-spinach (= 1.0.0)
stamp
state_machine
test_after_commit