diff --git a/Gemfile b/Gemfile index 1bb78bbe..139fb928 100644 --- a/Gemfile +++ b/Gemfile @@ -50,7 +50,7 @@ group :test do gem 'nyan-cat-formatter' gem 'rake' gem 'rspec-autotest' - gem 'rspec-rails', '>= 3.0.0' + gem 'rspec-rails', '~> 3.1.0' gem 'selenium-webdriver' gem 'simplecov', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 3219009a..f667a698 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,6 +86,7 @@ GEM colorize (0.7.5) concurrent-ruby (0.8.0) ref (~> 1.0, >= 1.0.5) + concurrent-ruby (0.8.0-java) concurrent-ruby-ext (0.8.0) concurrent-ruby (~> 0.8.0) database_cleaner (1.4.0) @@ -96,8 +97,8 @@ GEM excon (>= 0.38.0) json erubis (2.7.0) - excon (0.43.0) - execjs (2.2.2) + excon (0.44.1) + execjs (2.3.0) factory_girl (4.5.0) activesupport (>= 3.0.0) factory_girl_rails (4.5.0) @@ -228,7 +229,7 @@ GEM rubytree (0.9.4) json (~> 1.8) structured_warnings (~> 0.1) - rubyzip (1.1.6) + rubyzip (1.1.7) sass (3.2.19) sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) @@ -248,7 +249,7 @@ GEM multi_json (~> 1.0) simplecov-html (~> 0.8.0) simplecov-html (0.8.0) - slim (3.0.1) + slim (3.0.2) temple (~> 0.7.3) tilt (>= 1.3.3, < 2.1) slop (3.6.0) @@ -258,7 +259,7 @@ GEM oauth2 (>= 0.8.0) spoon (0.0.4) ffi - spring (1.2.0) + spring (1.3.0) sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) @@ -333,7 +334,7 @@ DEPENDENCIES rake ransack rspec-autotest - rspec-rails (>= 3.0.0) + rspec-rails (~> 3.1.0) rubytree sass-rails (~> 4.0.3) sdoc (~> 0.4.0)