From cc4a8e5558fb0711f4b6e54d91d8a81a391b6240 Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Thu, 8 Oct 2020 10:50:09 -0500 Subject: [PATCH] Update Rails to 6.0.3.4 --- Gemfile | 2 +- Gemfile.lock | 106 +++++++++++++++++++++++++-------------------------- NOTICE-ruby | 61 +++++++++++++++++++++-------- 3 files changed, 100 insertions(+), 69 deletions(-) diff --git a/Gemfile b/Gemfile index 5baa3145..8cac76b1 100755 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '2.6.6' -gem 'rails', '~> 6.0.3', '>= 6.0.3.3' +gem 'rails', '~> 6.0.3', '>= 6.0.3.4' 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 f2ac84fa..ed3c1441 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,56 +41,56 @@ GEM remote: https://rubygems.org/ specs: action_mailer_matchers (1.2.0) - actioncable (6.0.3.3) - actionpack (= 6.0.3.3) + actioncable (6.0.3.4) + actionpack (= 6.0.3.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.3) - actionpack (= 6.0.3.3) - activejob (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionmailbox (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) mail (>= 2.7.1) - actionmailer (6.0.3.3) - actionpack (= 6.0.3.3) - actionview (= 6.0.3.3) - activejob (= 6.0.3.3) + actionmailer (6.0.3.4) + actionpack (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.3) - actionview (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionpack (6.0.3.4) + actionview (= 6.0.3.4) + activesupport (= 6.0.3.4) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.3) - actionpack (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + actiontext (6.0.3.4) + actionpack (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) nokogiri (>= 1.8.5) - actionview (6.0.3.3) - activesupport (= 6.0.3.3) + actionview (6.0.3.4) + activesupport (= 6.0.3.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.3) - activesupport (= 6.0.3.3) + activejob (6.0.3.4) + activesupport (= 6.0.3.4) globalid (>= 0.3.6) - activemodel (6.0.3.3) - activesupport (= 6.0.3.3) - activerecord (6.0.3.3) - activemodel (= 6.0.3.3) - activesupport (= 6.0.3.3) - activestorage (6.0.3.3) - actionpack (= 6.0.3.3) - activejob (= 6.0.3.3) - activerecord (= 6.0.3.3) + activemodel (6.0.3.4) + activesupport (= 6.0.3.4) + activerecord (6.0.3.4) + activemodel (= 6.0.3.4) + activesupport (= 6.0.3.4) + activestorage (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) marcel (~> 0.3.1) - activesupport (6.0.3.3) + activesupport (6.0.3.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -224,7 +224,7 @@ GEM kdtree require_all netrc (0.11.0) - nio4r (2.5.3) + nio4r (2.5.4) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) @@ -257,20 +257,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.1) - rails (6.0.3.3) - actioncable (= 6.0.3.3) - actionmailbox (= 6.0.3.3) - actionmailer (= 6.0.3.3) - actionpack (= 6.0.3.3) - actiontext (= 6.0.3.3) - actionview (= 6.0.3.3) - activejob (= 6.0.3.3) - activemodel (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + rails (6.0.3.4) + actioncable (= 6.0.3.4) + actionmailbox (= 6.0.3.4) + actionmailer (= 6.0.3.4) + actionpack (= 6.0.3.4) + actiontext (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) + activemodel (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) bundler (>= 1.3.0) - railties (= 6.0.3.3) + railties (= 6.0.3.4) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -280,9 +280,9 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.0.3.3) - actionpack (= 6.0.3.3) - activesupport (= 6.0.3.3) + railties (6.0.3.4) + actionpack (= 6.0.3.4) + activesupport (= 6.0.3.4) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -366,7 +366,7 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -458,7 +458,7 @@ DEPENDENCIES rack-attack (~> 5.2) rack-ssl (~> 1.4) rack-timeout (~> 0.5.1) - rails (~> 6.0.3, >= 6.0.3.3) + rails (~> 6.0.3, >= 6.0.3.4) rails-i18n (~> 6.0.0, ~> 6) rake (~> 12.3.2) react-rails diff --git a/NOTICE-ruby b/NOTICE-ruby index db054cbe..6829faf9 100644 --- a/NOTICE-ruby +++ b/NOTICE-ruby @@ -2095,7 +2095,8 @@ THE SOFTWARE. ------ -** activestorage; version 6.0.3.3 -- +** activestorage; version 6.0.3.4 -- +Copyright (c) 2017-2019 David Heinemeier Hansson, Basecamp Copyright (c) 2017-2019 David Heinemeier Hansson, Basecamp @@ -2154,7 +2155,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** railties; version 6.0.3.3 -- +** railties; version 6.0.3.4 -- Copyright (c) 2004-2019 David Heinemeier Hansson Copyright (c) 2006-2013 Paul Battley, Michael Neumann, Tim Fletcher. @@ -2498,7 +2499,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** sprockets-rails; version 3.2.1 -- +** sprockets-rails; version 3.2.2 -- Copyright (c) 2014-2016 Joshua Peek Copyright (c) 2014-2016 Joshua Peek @@ -2582,7 +2583,7 @@ SOFTWARE. ------ -** nio4r; version 2.5.3 -- +** nio4r; version 2.5.4 -- (c) 2011 Emanuele Giaquinta Copyright (c) 2011 Tony Arcieri. Copyright, 2019, by Tony Arcieri. @@ -2821,7 +2822,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** activesupport; version 6.0.3.3 -- +** activesupport; version 6.0.3.4 -- Copyright (c) 2005-2019 David Heinemeier Hansson Copyright (c) 2005-2019 David Heinemeier Hansson @@ -3204,6 +3205,34 @@ The above copyright notice and this permission notice shall be included in all c 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. +------ + +** actioncable; version 6.0.3.4 -- +Copyright (c) 2010-2015 James Coglan +Copyright (c) 2015-2019 Basecamp, LLC + +Copyright (c) 2015-2019 Basecamp, LLC + +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. + + ------ ** tilt; version 2.0.9 -- @@ -3290,9 +3319,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** actioncable; version 6.0.3.3 -- -** actiontext; version 6.0.3.3 -- -** activerecord; version 6.0.3.3 -- +** activerecord; version 6.0.3.4 -- Copyright (c) 2004-2019 David Heinemeier Hansson copyright (c) 2007-2016 Nick Kallen, Bryan Helmkamp, Emilio Tagua, Aaron Patterson ** coderay; version 1.1.2 -- @@ -3329,7 +3356,7 @@ 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.0.3.3 -- +** rails; version 6.0.3.4 -- ** rails-dom-testing; version 2.0.3 -- Copyright (c) 2013-2015 Kasper Timm Hansen ** rails-html-sanitizer; version 1.3.0 -- @@ -3435,12 +3462,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** actionmailer; version 6.0.3.3 -- +** actionmailer; version 6.0.3.4 -- Copyright (c) 2004-2019 David Heinemeier Hansson -** actionpack; version 6.0.3.3 -- -** actionview; version 6.0.3.3 -- +** actionpack; version 6.0.3.4 -- +Copyright (c) 2004-2019 David Heinemeier Hansson +** actionview; version 6.0.3.4 -- +Copyright (c) 2004-2019 David Heinemeier Hansson +** activemodel; version 6.0.3.4 -- Copyright (c) 2004-2019 David Heinemeier Hansson -** activemodel; version 6.0.3.3 -- Copyright (c) 2004-2019 David Heinemeier Hansson @@ -3527,7 +3556,7 @@ THE SOFTWARE. ------ -** activejob; version 6.0.3.3 -- +** activejob; version 6.0.3.4 -- Copyright (c) 2014-2019 David Heinemeier Hansson Copyright (c) 2014-2019 David Heinemeier Hansson @@ -4286,7 +4315,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** actionmailbox; version 6.0.3.3 -- +** actionmailbox; version 6.0.3.4 -- +Copyright (c) 2019 Basecamp, LLC +** actiontext; version 6.0.3.4 -- Copyright (c) 2019 Basecamp, LLC MIT License