diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-12 19:32:46 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-12 19:32:46 +0000 |
| commit | 2505dc46e7fa34fc874a35691385bc8f3e56837e (patch) | |
| tree | fa3eec08868f754d987628a890b9eb6b20d6ac2c | |
| parent | 20418dc7dae516943253fd4a603e2b96ed25559e (diff) | |
| parent | 42a391f744a2ea43272483f998395c910153e1d2 (diff) | |
| download | gitlab-ce-2505dc46e7fa34fc874a35691385bc8f3e56837e.tar.gz | |
Merge branch 'rs-update-spring' into 'master'
Update spring and spring-commands-spinach
Spring changelog: https://git.io/vVAUY
See merge request !3681
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -285,9 +285,9 @@ group :development, :test do gem 'teaspoon', '~> 1.1.0' gem 'teaspoon-jasmine', '~> 2.2.0' - gem 'spring', '~> 1.6.4' + gem 'spring', '~> 1.7.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'spring-commands-spinach', '~> 1.0.0' + gem 'spring-commands-spinach', '~> 1.1.0' gem 'spring-commands-teaspoon', '~> 0.0.2' gem 'rubocop', '~> 0.38.0', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 9da44a46583..ad7d7c18559 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -769,10 +769,10 @@ GEM spinach (>= 0.4) spinach-rerun-reporter (0.0.2) spinach (~> 0.8) - spring (1.6.4) + spring (1.7.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - spring-commands-spinach (1.0.0) + spring-commands-spinach (1.1.0) spring (>= 0.9.1) spring-commands-teaspoon (0.0.2) spring (>= 0.9.1) @@ -1030,9 +1030,9 @@ DEPENDENCIES slack-notifier (~> 1.2.0) spinach-rails (~> 0.2.1) spinach-rerun-reporter (~> 0.0.2) - spring (~> 1.6.4) + spring (~> 1.7.0) spring-commands-rspec (~> 1.0.4) - spring-commands-spinach (~> 1.0.0) + spring-commands-spinach (~> 1.1.0) spring-commands-teaspoon (~> 0.0.2) sprockets (~> 3.6.0) state_machines-activerecord (~> 0.3.0) |