summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-04-12 14:28:07 -0400
committerRobert Speicher <rspeicher@gmail.com>2016-04-12 14:28:07 -0400
commit42a391f744a2ea43272483f998395c910153e1d2 (patch)
tree30bee53617b53e37e9ab7776707b136af558f2b8
parent2c9894d457cac2f15331081a4f6974e0803fead3 (diff)
downloadgitlab-ce-rs-update-spring.tar.gz
Update spring and spring-commands-spinachrs-update-spring
Spring changelog: https://git.io/vVAUY
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock8
2 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 258b5612cd5..199ef65d922 100644
--- 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
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)