diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-03 21:03:20 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-03 21:03:20 +0000 |
| commit | 77c7b5619f3559c12599ac9e3e9fb0af4a49a6b8 (patch) | |
| tree | 7101760ee5ced01f04573a2184cf2ca67db977c6 | |
| parent | ba869ae50d0c43867f7d34a4f7e08520c1e4c7f1 (diff) | |
| parent | 1ecefd3718f60731da6eb266115dbbb16df948b8 (diff) | |
| download | gitlab-ce-77c7b5619f3559c12599ac9e3e9fb0af4a49a6b8.tar.gz | |
Merge branch 'update-spring' into 'master'
Update spring to 1.6.4 to fix support for Bundler 1.11
See merge request !3083
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -278,7 +278,7 @@ group :development, :test do gem 'teaspoon', '~> 1.0.0' gem 'teaspoon-jasmine', '~> 2.2.0' - gem 'spring', '~> 1.3.6' + gem 'spring', '~> 1.6.4' gem 'spring-commands-rspec', '~> 1.0.4' gem 'spring-commands-spinach', '~> 1.0.0' gem 'spring-commands-teaspoon', '~> 0.0.2' diff --git a/Gemfile.lock b/Gemfile.lock index 79b80c1fa35..bdf7dbfd157 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -763,7 +763,7 @@ GEM capybara (>= 2.0.0) railties (>= 3) spinach (>= 0.4) - spring (1.3.6) + spring (1.6.4) spring-commands-rspec (1.0.4) spring (>= 0.9.1) spring-commands-spinach (1.0.0) @@ -1016,7 +1016,7 @@ DEPENDENCIES six (~> 0.2.0) slack-notifier (~> 1.2.0) spinach-rails (~> 0.2.1) - spring (~> 1.3.6) + spring (~> 1.6.4) spring-commands-rspec (~> 1.0.4) spring-commands-spinach (~> 1.0.0) spring-commands-teaspoon (~> 0.0.2) |