From a7b9486425b36a39aa4eba1cc83f9d41ee8c3ca2 Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Thu, 11 Feb 2021 18:09:57 -0600 Subject: [PATCH] Update to Rails 6.1.2.1 --- Gemfile | 2 +- Gemfile.lock | 122 +++++++++++++++++++++++++-------------------------- NOTICE-ruby | 83 +++++++++-------------------------- 3 files changed, 82 insertions(+), 125 deletions(-) diff --git a/Gemfile b/Gemfile index 9518718b..0bea14d3 100755 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '2.6.6' -gem 'rails', '~> 6.1.0' +gem 'rails', '~> 6.1.2.1' gem 'jbuilder', '~> 2.10' gem 'bootsnap', '~> 1.4', require: false # Large rails application booting enhancer gem 'font_assets', '~> 0.1.14' # for serving fonts on cdn https://github.com/ericallam/font_assets diff --git a/Gemfile.lock b/Gemfile.lock index 1e7ff0d7..33fa8fef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,60 +50,60 @@ GEM remote: https://rubygems.org/ specs: action_mailer_matchers (1.2.0) - actioncable (6.1.0) - actionpack (= 6.1.0) - activesupport (= 6.1.0) + actioncable (6.1.2.1) + actionpack (= 6.1.2.1) + activesupport (= 6.1.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.0) - actionpack (= 6.1.0) - activejob (= 6.1.0) - activerecord (= 6.1.0) - activestorage (= 6.1.0) - activesupport (= 6.1.0) + actionmailbox (6.1.2.1) + actionpack (= 6.1.2.1) + activejob (= 6.1.2.1) + activerecord (= 6.1.2.1) + activestorage (= 6.1.2.1) + activesupport (= 6.1.2.1) mail (>= 2.7.1) - actionmailer (6.1.0) - actionpack (= 6.1.0) - actionview (= 6.1.0) - activejob (= 6.1.0) - activesupport (= 6.1.0) + actionmailer (6.1.2.1) + actionpack (= 6.1.2.1) + actionview (= 6.1.2.1) + activejob (= 6.1.2.1) + activesupport (= 6.1.2.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.0) - actionview (= 6.1.0) - activesupport (= 6.1.0) + actionpack (6.1.2.1) + actionview (= 6.1.2.1) + activesupport (= 6.1.2.1) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.0) - actionpack (= 6.1.0) - activerecord (= 6.1.0) - activestorage (= 6.1.0) - activesupport (= 6.1.0) + actiontext (6.1.2.1) + actionpack (= 6.1.2.1) + activerecord (= 6.1.2.1) + activestorage (= 6.1.2.1) + activesupport (= 6.1.2.1) nokogiri (>= 1.8.5) - actionview (6.1.0) - activesupport (= 6.1.0) + actionview (6.1.2.1) + activesupport (= 6.1.2.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.0) - activesupport (= 6.1.0) + activejob (6.1.2.1) + activesupport (= 6.1.2.1) globalid (>= 0.3.6) - activemodel (6.1.0) - activesupport (= 6.1.0) - activerecord (6.1.0) - activemodel (= 6.1.0) - activesupport (= 6.1.0) - activestorage (6.1.0) - actionpack (= 6.1.0) - activejob (= 6.1.0) - activerecord (= 6.1.0) - activesupport (= 6.1.0) + activemodel (6.1.2.1) + activesupport (= 6.1.2.1) + activerecord (6.1.2.1) + activemodel (= 6.1.2.1) + activesupport (= 6.1.2.1) + activestorage (6.1.2.1) + actionpack (= 6.1.2.1) + activejob (= 6.1.2.1) + activerecord (= 6.1.2.1) + activesupport (= 6.1.2.1) marcel (~> 0.3.1) mimemagic (~> 0.3.2) - activesupport (6.1.0) + activesupport (6.1.2.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -125,7 +125,7 @@ GEM chronic (0.10.2) coderay (1.1.3) colorize (0.8.1) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) connection_pool (2.2.3) countries (3.0.1) i18n_data (~> 0.10.0) @@ -182,7 +182,7 @@ GEM httparty (0.17.3) mime-types (~> 3.0) multi_xml (>= 0.5.2) - i18n (1.8.7) + i18n (1.8.8) concurrent-ruby (~> 1.0) i18n_data (0.10.0) image_processing (1.10.3) @@ -201,7 +201,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.8.0) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -218,7 +218,7 @@ GEM mini_magick (4.11.0) mini_mime (1.0.2) mini_portile2 (2.5.0) - minitest (5.14.2) + minitest (5.14.3) money (6.13.8) i18n (>= 0.6.4, <= 2) msgpack (1.3.3) @@ -229,8 +229,8 @@ GEM kdtree require_all netrc (0.11.0) - nio4r (2.5.4) - nokogiri (1.11.0) + nio4r (2.5.5) + nokogiri (1.11.1) mini_portile2 (~> 2.5.0) racc (~> 1.4) orm_adapter (0.5.0) @@ -259,20 +259,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.2) - rails (6.1.0) - actioncable (= 6.1.0) - actionmailbox (= 6.1.0) - actionmailer (= 6.1.0) - actionpack (= 6.1.0) - actiontext (= 6.1.0) - actionview (= 6.1.0) - activejob (= 6.1.0) - activemodel (= 6.1.0) - activerecord (= 6.1.0) - activestorage (= 6.1.0) - activesupport (= 6.1.0) + rails (6.1.2.1) + actioncable (= 6.1.2.1) + actionmailbox (= 6.1.2.1) + actionmailer (= 6.1.2.1) + actionpack (= 6.1.2.1) + actiontext (= 6.1.2.1) + actionview (= 6.1.2.1) + activejob (= 6.1.2.1) + activemodel (= 6.1.2.1) + activerecord (= 6.1.2.1) + activestorage (= 6.1.2.1) + activesupport (= 6.1.2.1) bundler (>= 1.15.0) - railties (= 6.1.0) + railties (= 6.1.2.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -282,9 +282,9 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.1.0) - actionpack (= 6.1.0) - activesupport (= 6.1.0) + railties (6.1.2.1) + actionpack (= 6.1.2.1) + activesupport (= 6.1.2.1) method_source rake (>= 0.8.7) thor (~> 1.0) @@ -380,7 +380,7 @@ GEM table_print (1.5.7) test-unit (3.3.9) power_assert - thor (1.0.1) + thor (1.1.0) tilt (2.0.10) timecop (0.9.2) traceroute (0.8.1) @@ -453,7 +453,7 @@ DEPENDENCIES rack-attack (~> 5.2) rack-ssl (~> 1.4) rack-timeout (~> 0.5.1) - rails (~> 6.1.0) + rails (~> 6.1.2.1) rails-i18n (~> 6.0.0, ~> 6) rake (~> 12.3.2) react-rails diff --git a/NOTICE-ruby b/NOTICE-ruby index 5cf637fc..cafdb969 100644 --- a/NOTICE-ruby +++ b/NOTICE-ruby @@ -1110,12 +1110,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** actionmailer; version 6.1.0 -- -** actionpack; version 6.1.0 -- -** actionview; version 6.1.0 -- -** activemodel; version 6.1.0 -- -** railties; version 6.1.0 -- -Copyright (c) 2006-2013 Paul Battley, Michael Neumann, Tim Fletcher. +** actionmailer; version 6.1.2.1 -- +** actionpack; version 6.1.2.1 -- +** actionview; version 6.1.2.1 -- +** activemodel; version 6.1.2.1 -- Copyright (c) 2004-2020 David Heinemeier Hansson @@ -1855,7 +1853,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** actioncable; version 6.1.0 -- +** actioncable; version 6.1.2.1 -- Copyright (c) 2010-2015 James Coglan Copyright (c) 2015-2020 Basecamp, LLC @@ -1913,7 +1911,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** loofah; version 2.8.0 -- +** loofah; version 2.9.0 -- Copyright (c) 2006-2008 The Authors Copyright (c) 2009 2018 by Mike Dalessio, Bryan Helmkamp @@ -2438,7 +2436,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** actionmailbox; version 6.1.0 -- +** actionmailbox; version 6.1.2.1 -- MIT License @@ -2465,7 +2463,7 @@ SOFTWARE. ------ -** actiontext; version 6.1.0 -- +** actiontext; version 6.1.2.1 -- MIT License @@ -2556,7 +2554,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** concurrent-ruby; version 1.1.7 -- +** concurrent-ruby; version 1.1.8 -- Copyright Concurrent Ruby Copyright (c) Jerry D'Antonio Copyright (c) 2014 Jerry D'Antonio (https://twitter.com/jerrydantonio). @@ -2701,7 +2699,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** activejob; version 6.1.0 -- +** activejob; version 6.1.2.1 -- Copyright (c) 2014-2020 David Heinemeier Hansson @@ -2810,7 +2808,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** i18n; version 1.8.7 -- +** i18n; version 1.8.8 -- Copyright (c) 2003-2009 Masao Mutoh Copyright (c) 2008 The Ruby I18n team Copyright (c) 2005-2019 David Heinemeier Hansson @@ -2838,7 +2836,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** nokogiri; version 1.11.0 -- +** nokogiri; version 1.11.1 -- (c) Copyright 2002-2005, Andy Clark. Copyright (c) 1998-2003 Daniel Veillard. Copyright (c) 1998-2012 Daniel Veillard. @@ -2947,8 +2945,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** activerecord; version 6.1.0 -- +** activerecord; version 6.1.2.1 -- copyright (c) 2007-2016 Nick Kallen, Bryan Helmkamp, Emilio Tagua, Aaron Patterson +** activesupport; version 6.1.2.1 -- ** coderay; version 1.1.3 -- Copyright (c) 2005-2012 Kornelius Kalnbach ** crack; version 0.4.5 -- @@ -2969,26 +2968,9 @@ Copyright (c) 2010-2015, The Dojo Foundation ** mime-types; version 3.3.1 -- Copyright 2003-2019 Austin Ziegler and contributors. ** mime-types-data; version 3.2020.1104 -- -** minitest; version 5.14.2 -- +** minitest; version 5.14.3 -- Copyright (c) Ryan Davis, seattle.rb -** nio4r; version 2.5.4 -- -(c) 2011 Emanuele Giaquinta -Copyright (c) 2011 Tony Arcieri. -Copyright, 2019, by Tony Arcieri. -Copyright (c) 2011-2017 Tony Arcieri. -Copyright, 2007-2019, by Marc Alexander Lehmann. -(c) 2009-2015 Marc Alexander Lehmann -Copyright (c) 2019 Marc Alexander Lehmann -Copyright (c) 2007-2019 Marc Alexander Lehmann -Copyright (c) 2007,2008,2009 Marc Alexander Lehmann -Copyright (c) 2007,2008,2009,2010,2011,2012,2013 Marc Alexander Lehmann. -Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann -Copyright (c) 2007,2008,2009,2010,2011,2019 Marc Alexander Lehmann -Copyright, 2019, by Samuel G. D. Williams (http://www.codeotaku.com/samuel-williams). -Copyright (c) 2007,2008,2009,2010,2011,2016,2019 Marc Alexander Lehmann -Copyright (c) 2007,2008,2009,2010,2011,2012,2013,2019 Marc Alexander Lehmann -Copyright (c) 2007,2008,2009,2010,2011,2016,2017,2019 Marc Alexander Lehmann -Copyright (c) 2007,2008,2009,2010,2011,2012,2013,2016,2019 Marc Alexander Lehmann +** nio4r; version 2.5.5 -- ** qx; version 0.1.1 -- ** rack; version 2.2.3 -- Copyright (c) 2009-2018 Michael Fellinger @@ -2996,11 +2978,12 @@ Copyright (c) Django Software Foundation and individual contributors. Copyright (c) 2007-2019 Leah Neukirchen ** rack-attack; version 5.4.2 -- Copyright Kickstarter, PBC. -** rails; version 6.1.0 -- +** rails; version 6.1.2.1 -- ** rails-dom-testing; version 2.0.3 -- Copyright (c) 2013-2015 Kasper Timm Hansen ** rails-html-sanitizer; version 1.3.0 -- Copyright (c) 2013-2015 Rafael Mendonca Franca, Kasper Timm Hansen +** railties; version 6.1.2.1 -- ** wisper; version 2.0.1 -- Copyright (c) 2013 Kris Leech @@ -3041,32 +3024,6 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------- - -** activesupport; version 6.1.0 -- - -Copyright (c) 2005-2020 David Heinemeier Hansson - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - ------ ** roadie; version 4.0.0 -- @@ -3430,7 +3387,7 @@ THE SOFTWARE. ------ -** thor; version 1.0.1 -- +** thor; version 1.1.0 -- Copyright (c) 2003, 2004 Jim Weirich Copyright (c) 2008 Yehuda Katz, Eric Hodel @@ -3486,7 +3443,7 @@ THE SOFTWARE. ------ -** activestorage; version 6.1.0 -- +** activestorage; version 6.1.2.1 -- Copyright (c) 2017-2020 David Heinemeier Hansson, Basecamp