Merge branch 'rs-update-spring' into 'master'

Update spring and spring-commands-spinach Spring changelog: https://git.io/vVAUY See merge request !3681

Merge branch 'rs-update-spring' into 'master'
2505dc46 · Robert Speicher · 20418dc7 · 42a391f7 · 2505dc46 · 2505dc46
Commit 2505dc46 authored Apr 12, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

Gemfile Gemfile +2 -2

Gemfile.lock Gemfile.lock +4 -4

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -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

--- 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)