summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock5
2 files changed, 4 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index c07c0bebcfc..e2848697080 100644
--- a/Gemfile
+++ b/Gemfile
@@ -296,7 +296,7 @@ group :development, :test do
gem 'capybara-screenshot', '~> 1.0.0'
gem 'poltergeist', '~> 1.9.0'
- gem 'spring', '~> 1.7.0'
+ gem 'spring', '~> 2.0.0'
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'spring-commands-spinach', '~> 1.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9f79e38b3b4..f90620169b7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -745,7 +745,8 @@ GEM
spinach (>= 0.4)
spinach-rerun-reporter (0.0.2)
spinach (~> 0.8)
- spring (1.7.2)
+ spring (2.0.1)
+ activesupport (>= 4.2)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
spring-commands-spinach (1.1.0)
@@ -1001,7 +1002,7 @@ DEPENDENCIES
slack-notifier (~> 1.5.1)
spinach-rails (~> 0.2.1)
spinach-rerun-reporter (~> 0.0.2)
- spring (~> 1.7.0)
+ spring (~> 2.0.0)
spring-commands-rspec (~> 1.0.4)
spring-commands-spinach (~> 1.1.0)
sprockets (~> 3.7.0)