From 97e392fd26196738f6bb846cf91167f961e48d4e Mon Sep 17 00:00:00 2001 From: tamsin johnson Date: Tue, 13 Apr 2021 09:36:28 -0700 Subject: [PATCH] bump rails to 5.2.5 (#1672) this fixes errors related to the mimemagic GPL yank. --- Gemfile | 2 +- Gemfile.lock | 98 +++++++++++++++++++++++++--------------------------- 2 files changed, 49 insertions(+), 51 deletions(-) diff --git a/Gemfile b/Gemfile index 71f1709a4..c0099249b 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.2.4', '>= 5.2.4.3' +gem 'rails', '~> 5.2.5' gem 'activerecord-nulldb-adapter' # Use sqlite3 as the database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index 3536254a0..4f3ca2d57 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,25 +34,25 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.2.4.3) - actionpack (= 5.2.4.3) + actioncable (5.2.5) + actionpack (= 5.2.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.3) - actionpack (= 5.2.4.3) - actionview (= 5.2.4.3) - activejob (= 5.2.4.3) + actionmailer (5.2.5) + actionpack (= 5.2.5) + actionview (= 5.2.5) + activejob (= 5.2.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.3) - actionview (= 5.2.4.3) - activesupport (= 5.2.4.3) + actionpack (5.2.5) + actionview (= 5.2.5) + activesupport (= 5.2.5) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.4.3) - activesupport (= 5.2.4.3) + actionview (5.2.5) + activesupport (= 5.2.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -76,28 +76,28 @@ GEM active_encode (0.7.0) rails sprockets (< 4) - activejob (5.2.4.3) - activesupport (= 5.2.4.3) + activejob (5.2.5) + activesupport (= 5.2.5) globalid (>= 0.3.6) - activemodel (5.2.4.3) - activesupport (= 5.2.4.3) + activemodel (5.2.5) + activesupport (= 5.2.5) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.2.4.3) - activemodel (= 5.2.4.3) - activesupport (= 5.2.4.3) + activerecord (5.2.5) + activemodel (= 5.2.5) + activesupport (= 5.2.5) arel (>= 9.0) activerecord-import (1.0.7) activerecord (>= 3.2) activerecord-nulldb-adapter (0.4.0) activerecord (>= 2.0.0) - activestorage (5.2.4.3) - actionpack (= 5.2.4.3) - activerecord (= 5.2.4.3) - marcel (~> 0.3.1) - activesupport (5.2.4.3) + activestorage (5.2.5) + actionpack (= 5.2.5) + activerecord (= 5.2.5) + marcel (~> 1.0.0) + activesupport (5.2.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -328,7 +328,7 @@ GEM activesupport (>= 3.0, < 7.0) equivalent-xml (0.6.0) nokogiri (>= 1.4.3) - erubi (1.9.0) + erubi (1.10.0) ethon (0.12.0) ffi (>= 1.3.0) execjs (2.7.0) @@ -479,7 +479,7 @@ GEM signet solrizer (>= 3.4, < 5) tinymce-rails (~> 4.1) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) i18n-debug (1.2.0) i18n (< 2) @@ -602,7 +602,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.6.0) + loofah (2.9.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -610,18 +610,16 @@ GEM mailboxer (0.15.1) carrierwave (>= 0.5.8) rails (>= 5.0.0) - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.1) memoist (0.16.2) method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2021.0212) - mimemagic (0.3.5) mini_magick (4.11.0) - mini_mime (1.0.2) + mini_mime (1.1.0) mini_portile2 (2.5.0) - minitest (5.14.3) + minitest (5.14.4) mods (2.4.1) edtf iso-639 @@ -634,12 +632,12 @@ GEM redic net-http-persistent (3.1.0) connection_pool (~> 2.2) - nio4r (2.5.2) + nio4r (2.5.7) noid (0.9.0) noid-rails (3.0.2) actionpack (>= 5.0.0, < 7) noid (~> 0.9) - nokogiri (1.11.1) + nokogiri (1.11.3) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.4) @@ -689,18 +687,18 @@ GEM rack rack-test (0.7.0) rack (>= 1.0, < 3) - rails (5.2.4.3) - actioncable (= 5.2.4.3) - actionmailer (= 5.2.4.3) - actionpack (= 5.2.4.3) - actionview (= 5.2.4.3) - activejob (= 5.2.4.3) - activemodel (= 5.2.4.3) - activerecord (= 5.2.4.3) - activestorage (= 5.2.4.3) - activesupport (= 5.2.4.3) + rails (5.2.5) + actioncable (= 5.2.5) + actionmailer (= 5.2.5) + actionpack (= 5.2.5) + actionview (= 5.2.5) + activejob (= 5.2.5) + activemodel (= 5.2.5) + activerecord (= 5.2.5) + activestorage (= 5.2.5) + activesupport (= 5.2.5) bundler (>= 1.3.0) - railties (= 5.2.4.3) + railties (= 5.2.5) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -716,14 +714,14 @@ GEM railties (>= 5.0, < 6) rails_autolink (1.1.6) rails (> 3.1) - railties (5.2.4.3) - actionpack (= 5.2.4.3) - activesupport (= 5.2.4.3) + railties (5.2.5) + actionpack (= 5.2.5) + activesupport (= 5.2.5) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (13.0.1) + rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -931,7 +929,7 @@ GEM babel-source (>= 5.8.11) babel-transpiler sprockets (>= 3.0.0) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -1036,7 +1034,7 @@ DEPENDENCIES pg puma (~> 3.12) rack-test (= 0.7.0) - rails (~> 5.2.4, >= 5.2.4.3) + rails (~> 5.2.5) rails-controller-testing riiif (~> 1.1) rolify