diff --git a/Gemfile b/Gemfile index b595d5690..9c84c0f11 100644 --- a/Gemfile +++ b/Gemfile @@ -66,7 +66,7 @@ group :development, :test do # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' gem 'spring-commands-rspec' - gem 'rspec-rails', '~> 3.3' + gem 'rspec-rails', '~> 3.5' gem 'capybara' gem 'factory_girl_rails' gem 'fuubar' @@ -76,7 +76,7 @@ group :development, :test do gem 'i18n-tasks' gem 'capistrano', '3.4.1', require: false gem "capistrano-bundler", '1.1.4', require: false - gem "capistrano-rails", '1.1.6', require: false + gem "capistrano-rails", '1.1.7', require: false gem "capistrano-rvm", require: false gem 'capistrano3-delayed-job', '~> 1.0' gem "bullet" @@ -92,5 +92,5 @@ end group :development do # Access an IRB console on exception pages or by using <%= console %> in views - gem 'web-console', '~> 3.0' + gem 'web-console', '3.3.0' end diff --git a/Gemfile.lock b/Gemfile.lock index 512138afc..ff4c9fc8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,7 +77,7 @@ GEM capistrano-bundler (1.1.4) capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-rails (1.1.6) + capistrano-rails (1.1.7) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rvm (0.1.2) @@ -229,7 +229,7 @@ GEM multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (3.1.1) + net-ssh (3.2.0) newrelic_rpm (3.16.0.318) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) @@ -319,27 +319,27 @@ GEM rinku (2.0.0) rollbar (2.12.0) multi_json - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.4) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.1) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-rails (3.4.2) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) + rspec-support (~> 3.5.0) + rspec-rails (3.5.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) ruby-progressbar (1.7.5) safe_yaml (1.0.4) safely_block (0.1.0) @@ -381,7 +381,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.10.0) + sshkit (1.11.1) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) term-ansicolor (1.3.2) @@ -416,7 +416,7 @@ GEM wasabi (3.5.0) httpi (~> 2.0) nokogiri (>= 1.4.2) - web-console (3.1.1) + web-console (3.3.0) activemodel (>= 4.2) debug_inspector railties (>= 4.2) @@ -442,7 +442,7 @@ DEPENDENCIES cancancan capistrano (= 3.4.1) capistrano-bundler (= 1.1.4) - capistrano-rails (= 1.1.6) + capistrano-rails (= 1.1.7) capistrano-rvm capistrano3-delayed-job (~> 1.0) capybara @@ -485,7 +485,7 @@ DEPENDENCIES responders rinku rollbar (~> 2.12.0) - rspec-rails (~> 3.3) + rspec-rails (~> 3.5) sass-rails (~> 5.0, >= 5.0.4) savon social-share-button @@ -496,7 +496,7 @@ DEPENDENCIES turnout uglifier (>= 1.3.0) unicorn (~> 5.1.0) - web-console (~> 3.0) + web-console (= 3.3.0) whenever BUNDLED WITH