diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-16 11:24:26 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-16 11:24:26 +0200 |
| commit | 4bbb3d5510d5396eca034a9a8593952b16b15ab5 (patch) | |
| tree | ac1676fc75e673248732ae6ca35aa26e9529eefa | |
| parent | 242cf70a0d1f1522b85b2f66af056c1963aa8352 (diff) | |
| parent | 5a68db91c8a2ae7d23b07a5c52b8b74d859a819f (diff) | |
| download | gitlab-ce-4bbb3d5510d5396eca034a9a8593952b16b15ab5.tar.gz | |
Merge pull request #6333 from jvanbaarsen/added-spring
Added spring to the project
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 12 insertions, 0 deletions
@@ -208,6 +208,10 @@ group :development, :test do gem 'spork', '~> 1.0rc' gem 'jasmine', '2.0.0.rc5' + + gem "spring", '1.1.1' + gem "spring-commands-rspec", '1.0.1' + gem "spring-commands-spinach", '1.0.0' end group :test do 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 |