From 0999f4dfc4a1eb0ff11d5e2e80c6920ac2992b33 Mon Sep 17 00:00:00 2001 From: Heiko Bernloehr Date: Fri, 5 Jun 2020 12:17:05 +0200 Subject: Upgrade to Rails 4.2.11.3 --- Gemfile | 2 +- Gemfile.lock | 132 +++++++++++++++++++++++++------------------------- config/application.rb | 3 ++ 3 files changed, 70 insertions(+), 67 deletions(-) diff --git a/Gemfile b/Gemfile index 5f57de9..22b6ae6 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' ruby '2.4.10' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.2.10' +gem 'rails', '4.2.11.3' # Use sqlite3 as the database for Active Record gem 'sqlite3', group: :db_sqlite3 # Use SCSS for stylesheets diff --git a/Gemfile.lock b/Gemfile.lock index 1d53c04..584a0c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,36 +1,36 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) + actionmailer (4.2.11.3) + actionpack (= 4.2.11.3) + actionview (= 4.2.11.3) + activejob (= 4.2.11.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.10) - actionview (= 4.2.10) - activesupport (= 4.2.10) + actionpack (4.2.11.3) + actionview (= 4.2.11.3) + activesupport (= 4.2.11.3) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.10) - activesupport (= 4.2.10) + actionview (4.2.11.3) + activesupport (= 4.2.11.3) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.10) - activesupport (= 4.2.10) + activejob (4.2.11.3) + activesupport (= 4.2.11.3) globalid (>= 0.3.0) - activemodel (4.2.10) - activesupport (= 4.2.10) + activemodel (4.2.11.3) + activesupport (= 4.2.11.3) builder (~> 3.1) - activerecord (4.2.10) - activemodel (= 4.2.10) - activesupport (= 4.2.10) + activerecord (4.2.11.3) + activemodel (= 4.2.11.3) + activesupport (= 4.2.11.3) arel (~> 6.0) - activesupport (4.2.10) + activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -38,7 +38,8 @@ GEM arel (6.0.4) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - builder (3.2.3) + builder (3.2.4) + byebug (11.1.3) coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) @@ -47,55 +48,55 @@ GEM execjs coffee-script-source (1.12.2) commonjs (0.2.7) - concurrent-ruby (1.0.5) - crass (1.0.3) + concurrent-ruby (1.1.6) + crass (1.0.6) debug_inspector (0.0.3) erubis (2.7.0) execjs (2.7.0) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) haml (4.0.5) tilt hike (1.2.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jbuilder (2.7.0) + jbuilder (2.9.1) activesupport (>= 4.2.0) - multi_json (>= 1.2) - jquery-rails (4.3.1) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.6) - kgio (2.11.2) + kgio (2.11.3) less (2.6.0) commonjs (~> 0.2.7) libv8 (3.16.14.19) - loofah (2.2.0) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) - mini_mime (1.0.0) - mini_portile2 (2.3.0) - minitest (5.11.3) - multi_json (1.13.1) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.1) + multi_json (1.14.1) + mysql2 (0.4.10) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) pg (0.21.0) - rack (1.6.9) + rack (1.6.13) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.10) - actionmailer (= 4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) - activemodel (= 4.2.10) - activerecord (= 4.2.10) - activesupport (= 4.2.10) + rails (4.2.11.3) + actionmailer (= 4.2.11.3) + actionpack (= 4.2.11.3) + actionview (= 4.2.11.3) + activejob (= 4.2.11.3) + activemodel (= 4.2.11.3) + activerecord (= 4.2.11.3) + activesupport (= 4.2.11.3) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.10) + railties (= 4.2.11.3) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -103,20 +104,20 @@ GEM activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.10) - actionpack (= 4.2.10) - activesupport (= 4.2.10) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (4.2.11.3) + actionpack (= 4.2.11.3) + activesupport (= 4.2.11.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.19.0) - rake (12.3.0) + raindrops (0.19.1) + rake (13.0.1) rdoc (4.3.0) ref (2.0.0) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) sass (3.2.19) sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) @@ -126,11 +127,10 @@ GEM sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - simple-navigation (4.0.5) + simple-navigation (4.1.0) activesupport (>= 2.3.2) - spring (2.0.2) - activesupport (>= 4.2) - sprockets (2.12.4) + spring (2.1.0) + sprockets (2.12.5) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -139,21 +139,21 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.13) + sqlite3 (1.4.2) therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (0.20.0) + thor (1.0.1) thread_safe (0.3.6) tilt (1.4.1) - turbolinks (5.1.0) - turbolinks-source (~> 5.1) - turbolinks-source (5.1.0) - tzinfo (1.2.5) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.7) thread_safe (~> 0.1) - uglifier (4.1.6) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicorn (5.4.0) + unicorn (5.5.5) kgio (~> 2.6) raindrops (~> 0.7) unicorn-rails (2.2.1) @@ -175,7 +175,7 @@ DEPENDENCIES jquery-rails less pg (~> 0.11) - rails (= 4.2.10) + rails (= 4.2.11.3) responders (~> 2.0) sass-rails (~> 4.0.3) sdoc (~> 0.4.0) diff --git a/config/application.rb b/config/application.rb index cf69eb9..b954d97 100644 --- a/config/application.rb +++ b/config/application.rb @@ -23,5 +23,8 @@ module Ecs4 # config.i18n.default_locale = :de config.middleware.use "ContentLength" config.assets.initialize_on_precompile false + + # Do not swallow errors in after_commit/after_rollback callbacks. + config.active_record.raise_in_transactional_callbacks = true end end -- cgit v1.2.3