From 93c47d774e941ee91c7e62864c32ed75276228ba Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 15 Aug 2016 22:01:56 +0930 Subject: [PATCH 1/4] Upgrade minor gems: kramdown, notifany, httparty, codemirror-rails, bootstrap_form, globalid --- Gemfile.lock | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0345f4ad7..3bc31145c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,7 +70,7 @@ GEM bootstrap-sass (3.3.6) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - bootstrap_form (2.3.0) + bootstrap_form (2.5.0) builder (3.2.2) byebug (9.0.5) cancancan (1.15.0) @@ -96,8 +96,8 @@ GEM climate_control (>= 0.0.3, < 1.0) codeclimate-test-reporter (0.6.0) simplecov (>= 0.7.1, < 1.0.0) - codemirror-rails (5.11) - railties (>= 3.0, < 5) + codemirror-rails (5.16.0) + railties (>= 3.0, < 6.0) coderay (1.1.1) coffee-rails (4.1.1) coffee-script (>= 2.2.0) @@ -181,7 +181,7 @@ GEM gibbon (1.2.1) httparty multi_json (>= 1.9.0) - globalid (0.3.6) + globalid (0.3.7) activesupport (>= 4.1.0) gravatar-ultimate (2.0.0) activesupport (>= 2.3.14) @@ -218,8 +218,7 @@ GEM haml (~> 4.0.0) nokogiri (~> 1.6.0) ruby_parser (~> 3.5) - httparty (0.13.7) - json (~> 1.8) + httparty (0.14.0) multi_xml (>= 0.5.2) i18n (0.7.0) i18n-tasks (0.9.5) @@ -246,7 +245,7 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) - kramdown (1.11.1) + kramdown (1.12.0) launchy (2.4.3) addressable (~> 2.3) leaflet-markercluster-rails (0.7.0) @@ -279,7 +278,7 @@ GEM nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) - notiffany (0.1.0) + notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) oauth (0.5.1) From 9bbaaa22117e339d805dedca87dbf8adcca0519f Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 15 Aug 2016 22:04:43 +0930 Subject: [PATCH 2/4] Upgrade excon ffi autoprefixer-rails multi_json mimemagic pry active_utils activemerchant --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3bc31145c..9f70a927d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,13 +24,13 @@ GEM actionpack active_merchant-paypal-bogus-gateway (0.1.0) activemerchant - active_utils (3.2.0) - activesupport (>= 3.2) + active_utils (3.2.2) + activesupport (>= 3.2, < 5.1.0) i18n activejob (4.2.6) activesupport (= 4.2.6) globalid (>= 0.3.0) - activemerchant (1.59.0) + activemerchant (1.60.0) activesupport (>= 3.2.14, < 5.1) builder (>= 2.1.2, < 4.0.0) i18n (>= 0.6.9) @@ -51,7 +51,7 @@ GEM addressable (2.4.0) arel (6.0.3) ast (2.3.0) - autoprefixer-rails (6.3.6.2) + autoprefixer-rails (6.4.0.2) execjs bcrypt (3.1.11) better_errors (2.1.1) @@ -159,7 +159,7 @@ GEM faraday multi_json erubis (2.7.0) - excon (0.50.1) + excon (0.51.0) execjs (2.7.0) factory_girl (4.7.0) activesupport (>= 3.0.0) @@ -168,7 +168,7 @@ GEM railties (>= 3.0.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.10) + ffi (1.9.14) figaro (1.1.1) thor (~> 0.14) flickraw (0.9.9) @@ -311,7 +311,7 @@ GEM capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - pry (0.10.3) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) From 5354f2732f01f4185f7afd65b279bf6ea8c07580 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 15 Aug 2016 22:07:39 +0930 Subject: [PATCH 3/4] Update bootstrap-sass coveralls friendly_id js-routes sass-rails simplecov --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9f70a927d..53ebe467a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,7 +67,7 @@ GEM bootstrap-kaminari-views (0.0.5) kaminari (>= 0.13) rails (>= 3.1) - bootstrap-sass (3.3.6) + bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) bootstrap_form (2.5.0) @@ -122,12 +122,12 @@ GEM rails-i18n (>= 4.0.0) sass-rails (>= 4.0.3) concurrent-ruby (1.0.2) - coveralls (0.8.13) - json (~> 1.8) - simplecov (~> 0.11.0) + coveralls (0.8.15) + json (>= 1.8, < 3) + simplecov (~> 0.12.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) - tins (~> 1.6.0) + tins (>= 1.6.0, < 2) csv_shaper (1.2.0) activesupport (>= 3.0.0) dalli (2.7.6) @@ -237,7 +237,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - js-routes (1.2.6) + js-routes (1.2.9) railties (>= 3.2) sprockets-rails json (1.8.3) @@ -390,7 +390,7 @@ GEM sexp_processor (~> 4.1) rubyzip (1.2.0) sass (3.4.22) - sass-rails (5.0.5) + sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) @@ -402,13 +402,13 @@ GEM websocket (~> 1.0) sexp_processor (4.7.0) shellany (0.0.1) - simplecov (0.11.2) + simplecov (0.12.0) docile (~> 1.1.0) - json (~> 1.8) + json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slop (3.6.0) - sprockets (3.6.2) + sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.1.1) @@ -422,7 +422,7 @@ GEM thread (0.2.2) thread_safe (0.3.5) tilt (2.0.5) - tins (1.6.0) + tins (1.12.0) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.7.2) From 711ba73d6b29f3862fd6dff97563dc8570b256c1 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 15 Aug 2016 22:12:34 +0930 Subject: [PATCH 4/4] Upgrade devise to 4.2 --- Gemfile.lock | 2 +- spec/rails_helper.rb | 2 +- spec/support/devise.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 53ebe467a..a78625f16 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -133,7 +133,7 @@ GEM dalli (2.7.6) database_cleaner (1.5.3) debug_inspector (0.0.2) - devise (4.1.1) + devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index dac96d64e..600c5495d 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -96,7 +96,7 @@ RSpec.configure do |config| # controller specs require this to work with Devise # see https://github.com/plataformatec/devise/wiki/How-To%3a-Controllers-and-Views-tests-with-Rails-3-%28and-rspec%29 - config.include Devise::TestHelpers, type: :controller + config.include Devise::Test::ControllerHelpers, type: :controller config.extend ControllerMacros, type: :controller # Allow just create(:factory) instead of needing to specify FactoryGirl.create(:factory) diff --git a/spec/support/devise.rb b/spec/support/devise.rb index 5fffd6c3f..0cf56ea83 100644 --- a/spec/support/devise.rb +++ b/spec/support/devise.rb @@ -1,4 +1,4 @@ RSpec.configure do |config| - config.include Devise::TestHelpers, type: :controller - config.include Devise::TestHelpers, type: :view + config.include Devise::Test::ControllerHelpers, type: :controller + config.include Devise::Test::ControllerHelpers, type: :view end