diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-05 00:16:50 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-05 00:16:50 +0000 |
| commit | 694ac54862d9b88ee0e82577d8fbf622534391bf (patch) | |
| tree | 4b60e862ac1dd833086df3deec5d98f56b1ce85d | |
| parent | 7a8fcc738bc54d4295be3dd9241f866c000ffb0a (diff) | |
| parent | 94229f24c7507c64786cd511ccf994e4fea83765 (diff) | |
| download | gitlab-ce-694ac54862d9b88ee0e82577d8fbf622534391bf.tar.gz | |
Merge branch 'update-spring' into 'master'
Update spring to 1.3.3
See merge request !1635
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -250,7 +250,7 @@ group :development, :test do gem 'jasmine', '2.0.2' - gem "spring", '1.3.1' + gem "spring", '~> 1.3.1' gem "spring-commands-rspec", '1.0.4' gem "spring-commands-spinach", '1.0.0' end diff --git a/Gemfile.lock b/Gemfile.lock index 1413e967416..88ae8ac01be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -570,7 +570,7 @@ GEM capybara (>= 2.0.0) railties (>= 3) spinach (>= 0.4) - spring (1.3.1) + spring (1.3.3) spring-commands-rspec (1.0.4) spring (>= 0.9.1) spring-commands-spinach (1.0.0) @@ -773,7 +773,7 @@ DEPENDENCIES slack-notifier (~> 1.0.0) slim spinach-rails - spring (= 1.3.1) + spring (~> 1.3.1) spring-commands-rspec (= 1.0.4) spring-commands-spinach (= 1.0.0) stamp |