summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-02-12 14:23:15 +0100
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-02-12 14:23:15 +0100
commit597359b04ff8c696a64ef5891689217af9f8a636 (patch)
tree2ebbc88668b27b68dcb94eb8085eccb374dfb55e
parentd9f84f68675f4f2f637585754565f40564574e3c (diff)
downloadgitlab-ce-597359b04ff8c696a64ef5891689217af9f8a636.tar.gz
Updated spring
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock8
2 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 4d6d6e7e143..c4812c451ca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -250,8 +250,8 @@ group :development, :test do
gem 'jasmine', '2.0.2'
- gem "spring", '1.1.3'
- gem "spring-commands-rspec", '1.0.1'
+ gem "spring", '1.3.1'
+ gem "spring-commands-rspec", '1.0.4'
gem "spring-commands-spinach", '1.0.0'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index aef30046d33..f9693d6a773 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -539,8 +539,8 @@ GEM
capybara (>= 2.0.0)
railties (>= 3)
spinach (>= 0.4)
- spring (1.1.3)
- spring-commands-rspec (1.0.1)
+ spring (1.3.1)
+ spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
spring-commands-spinach (1.0.0)
spring (>= 0.9.1)
@@ -742,8 +742,8 @@ DEPENDENCIES
slack-notifier (~> 1.0.0)
slim
spinach-rails
- spring (= 1.1.3)
- spring-commands-rspec (= 1.0.1)
+ spring (= 1.3.1)
+ spring-commands-rspec (= 1.0.4)
spring-commands-spinach (= 1.0.0)
stamp
state_machine