Merge branch 'update-spring' into 'master'

Update spring to 1.3.3 See merge request !1635

Merge branch 'update-spring' into 'master'
694ac548 · Dmitriy Zaporozhets · 7a8fcc73 · 94229f24 · 694ac548 · 694ac548
Commit 694ac548 authored Mar 05, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -250,7 +250,7 @@ group :development, :test do

  gem 'jasmine', '2.0.2'

-  gem "spring", '1.3.1'
+  gem "spring", '~> 1.3.1'
  gem "spring-commands-rspec", '1.0.4'
  gem "spring-commands-spinach", '1.0.0'
 end

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -570,7 +570,7 @@ GEM
      capybara (>= 2.0.0)
      railties (>= 3)
      spinach (>= 0.4)
-    spring (1.3.1)
+    spring (1.3.3)
    spring-commands-rspec (1.0.4)
      spring (>= 0.9.1)
    spring-commands-spinach (1.0.0)
@@ -773,7 +773,7 @@ DEPENDENCIES
  slack-notifier (~> 1.0.0)
  slim
  spinach-rails
-  spring (= 1.3.1)
+  spring (~> 1.3.1)
  spring-commands-rspec (= 1.0.4)
  spring-commands-spinach (= 1.0.0)
  stamp