From 323b7564eca603c41b2205fda3891fcb9b60545a Mon Sep 17 00:00:00 2001 From: John Lees-Miller Date: Sun, 17 Mar 2019 10:09:15 +0100 Subject: [PATCH] Upgrade to rails 5.1.6.2 --- Gemfile | 2 +- Gemfile.lock | 80 +++++++++++++++---------------- config/environments/production.rb | 2 +- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Gemfile b/Gemfile index 63eb3bd..8a8bae5 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ git_source(:github) do |repo_name| end # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.1.6.1' +gem 'rails', '~> 5.1.6.2' # Use postgresql as the database for Active Record gem 'pg', '>= 0.18', '< 2.0' # Use Puma as the app server diff --git a/Gemfile.lock b/Gemfile.lock index e937fbd..6ae2e0d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,25 +1,25 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.1.6.1) - actionpack (= 5.1.6.1) + actioncable (5.1.6.2) + actionpack (= 5.1.6.2) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.6.1) - actionpack (= 5.1.6.1) - actionview (= 5.1.6.1) - activejob (= 5.1.6.1) + actionmailer (5.1.6.2) + actionpack (= 5.1.6.2) + actionview (= 5.1.6.2) + activejob (= 5.1.6.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.6.1) - actionview (= 5.1.6.1) - activesupport (= 5.1.6.1) + actionpack (5.1.6.2) + actionview (= 5.1.6.2) + activesupport (= 5.1.6.2) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.6.1) - activesupport (= 5.1.6.1) + actionview (5.1.6.2) + activesupport (= 5.1.6.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -36,16 +36,16 @@ GEM ransack (~> 1.3) sass (~> 3.1) sprockets (< 4.1) - activejob (5.1.6.1) - activesupport (= 5.1.6.1) + activejob (5.1.6.2) + activesupport (= 5.1.6.2) globalid (>= 0.3.6) - activemodel (5.1.6.1) - activesupport (= 5.1.6.1) - activerecord (5.1.6.1) - activemodel (= 5.1.6.1) - activesupport (= 5.1.6.1) + activemodel (5.1.6.2) + activesupport (= 5.1.6.2) + activerecord (5.1.6.2) + activemodel (= 5.1.6.2) + activesupport (= 5.1.6.2) arel (~> 8.0) - activesupport (5.1.6.1) + activesupport (5.1.6.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -84,7 +84,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.5) crass (1.0.4) devise (4.4.3) bcrypt (~> 3.0) @@ -92,18 +92,18 @@ GEM railties (>= 4.1.0, < 6.0) responders warden (~> 1.2.3) - erubi (1.7.1) + erubi (1.8.0) execjs (2.7.0) ffi (1.10.0) formtastic (3.1.5) actionpack (>= 3.2.13) formtastic_i18n (0.6.0) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) has_scope (0.7.1) actionpack (>= 4.1, < 5.2) activesupport (>= 4.1, < 5.2) - i18n (1.1.1) + i18n (1.6.0) concurrent-ruby (~> 1.0) inherited_resources (1.8.0) actionpack (>= 4.2, <= 5.2) @@ -141,12 +141,12 @@ GEM mini_mime (>= 0.1.1) method_source (0.9.2) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) multi_json (1.13.1) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) parallel (1.12.1) parser (2.5.0.5) @@ -164,26 +164,26 @@ GEM rack (>= 1.0.0, < 3) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.1.6.1) - actioncable (= 5.1.6.1) - actionmailer (= 5.1.6.1) - actionpack (= 5.1.6.1) - actionview (= 5.1.6.1) - activejob (= 5.1.6.1) - activemodel (= 5.1.6.1) - activerecord (= 5.1.6.1) - activesupport (= 5.1.6.1) + rails (5.1.6.2) + actioncable (= 5.1.6.2) + actionmailer (= 5.1.6.2) + actionpack (= 5.1.6.2) + actionview (= 5.1.6.2) + activejob (= 5.1.6.2) + activemodel (= 5.1.6.2) + activerecord (= 5.1.6.2) + activesupport (= 5.1.6.2) bundler (>= 1.3.0) - railties (= 5.1.6.1) + railties (= 5.1.6.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (5.1.6.1) - actionpack (= 5.1.6.1) - activesupport (= 5.1.6.1) + railties (5.1.6.2) + actionpack (= 5.1.6.2) + activesupport (= 5.1.6.2) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -288,7 +288,7 @@ DEPENDENCIES pg (>= 0.18, < 2.0) puma (~> 3.7) rack-canonical-host - rails (~> 5.1.6.1) + rails (~> 5.1.6.2) recaptcha rubocop sass-rails (~> 5.0) diff --git a/config/environments/production.rb b/config/environments/production.rb index 551db06..93648db 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -78,7 +78,7 @@ Rails.application.configure do # Enable locale fallbacks for I18n (makes lookups for any locale fall back to # the I18n.default_locale when a translation cannot be found). - config.i18n.fallbacks = true + config.i18n.fallbacks = [I18n.default_locale] # Send deprecation notices to registered listeners. config.active_support.deprecation = :notify