From 147557dc16a5bd8bab96f999f359a570232e1873 Mon Sep 17 00:00:00 2001 From: eileencodes Date: Mon, 9 May 2022 09:44:09 -0400 Subject: [PATCH] Preparing for 6.1.6 release --- Gemfile.lock | 132 ++++++++++-------- RAILS_VERSION | 2 +- actioncable/lib/action_cable/gem_version.rb | 4 +- actioncable/package.json | 2 +- .../lib/action_mailbox/gem_version.rb | 4 +- actionmailer/lib/action_mailer/gem_version.rb | 4 +- actionpack/lib/action_pack/gem_version.rb | 4 +- actiontext/lib/action_text/gem_version.rb | 4 +- actiontext/package.json | 2 +- actionview/lib/action_view/gem_version.rb | 4 +- actionview/package.json | 2 +- activejob/lib/active_job/gem_version.rb | 4 +- activemodel/lib/active_model/gem_version.rb | 4 +- activerecord/lib/active_record/gem_version.rb | 4 +- .../lib/active_storage/gem_version.rb | 4 +- activestorage/package.json | 2 +- .../lib/active_support/gem_version.rb | 4 +- railties/lib/rails/gem_version.rb | 4 +- version.rb | 4 +- 19 files changed, 108 insertions(+), 86 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0887a8fe568fe..b08d5ad178c33 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,83 +30,83 @@ GIT PATH remote: . specs: - actioncable (6.1.5.1) - actionpack (= 6.1.5.1) - activesupport (= 6.1.5.1) + actioncable (6.1.6) + actionpack (= 6.1.6) + activesupport (= 6.1.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.5.1) - actionpack (= 6.1.5.1) - activejob (= 6.1.5.1) - activerecord (= 6.1.5.1) - activestorage (= 6.1.5.1) - activesupport (= 6.1.5.1) + actionmailbox (6.1.6) + actionpack (= 6.1.6) + activejob (= 6.1.6) + activerecord (= 6.1.6) + activestorage (= 6.1.6) + activesupport (= 6.1.6) mail (>= 2.7.1) - actionmailer (6.1.5.1) - actionpack (= 6.1.5.1) - actionview (= 6.1.5.1) - activejob (= 6.1.5.1) - activesupport (= 6.1.5.1) + actionmailer (6.1.6) + actionpack (= 6.1.6) + actionview (= 6.1.6) + activejob (= 6.1.6) + activesupport (= 6.1.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.5.1) - actionview (= 6.1.5.1) - activesupport (= 6.1.5.1) + actionpack (6.1.6) + actionview (= 6.1.6) + activesupport (= 6.1.6) 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.5.1) - actionpack (= 6.1.5.1) - activerecord (= 6.1.5.1) - activestorage (= 6.1.5.1) - activesupport (= 6.1.5.1) + actiontext (6.1.6) + actionpack (= 6.1.6) + activerecord (= 6.1.6) + activestorage (= 6.1.6) + activesupport (= 6.1.6) nokogiri (>= 1.8.5) - actionview (6.1.5.1) - activesupport (= 6.1.5.1) + actionview (6.1.6) + activesupport (= 6.1.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.5.1) - activesupport (= 6.1.5.1) + activejob (6.1.6) + activesupport (= 6.1.6) globalid (>= 0.3.6) - activemodel (6.1.5.1) - activesupport (= 6.1.5.1) - activerecord (6.1.5.1) - activemodel (= 6.1.5.1) - activesupport (= 6.1.5.1) - activestorage (6.1.5.1) - actionpack (= 6.1.5.1) - activejob (= 6.1.5.1) - activerecord (= 6.1.5.1) - activesupport (= 6.1.5.1) + activemodel (6.1.6) + activesupport (= 6.1.6) + activerecord (6.1.6) + activemodel (= 6.1.6) + activesupport (= 6.1.6) + activestorage (6.1.6) + actionpack (= 6.1.6) + activejob (= 6.1.6) + activerecord (= 6.1.6) + activesupport (= 6.1.6) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.5.1) + activesupport (6.1.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - rails (6.1.5.1) - actioncable (= 6.1.5.1) - actionmailbox (= 6.1.5.1) - actionmailer (= 6.1.5.1) - actionpack (= 6.1.5.1) - actiontext (= 6.1.5.1) - actionview (= 6.1.5.1) - activejob (= 6.1.5.1) - activemodel (= 6.1.5.1) - activerecord (= 6.1.5.1) - activestorage (= 6.1.5.1) - activesupport (= 6.1.5.1) + rails (6.1.6) + actioncable (= 6.1.6) + actionmailbox (= 6.1.6) + actionmailer (= 6.1.6) + actionpack (= 6.1.6) + actiontext (= 6.1.6) + actionview (= 6.1.6) + activejob (= 6.1.6) + activemodel (= 6.1.6) + activerecord (= 6.1.6) + activestorage (= 6.1.6) + activesupport (= 6.1.6) bundler (>= 1.15.0) - railties (= 6.1.5.1) + railties (= 6.1.6) sprockets-rails (>= 2.0.0) - railties (6.1.5.1) - actionpack (= 6.1.5.1) - activesupport (= 6.1.5.1) + railties (6.1.6) + actionpack (= 6.1.6) + activesupport (= 6.1.6) method_source rake (>= 12.2) thor (~> 1.0) @@ -205,6 +205,7 @@ GEM delayed_job_active_record (4.1.6) activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) + digest (3.1.0) digest-crc (0.6.3) rake (>= 12.0.0, < 14.0.0) em-http-request (1.1.7) @@ -303,12 +304,13 @@ GEM listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.16.0) + loofah (2.17.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) marcel (1.0.2) + matrix (0.4.2) memoist (0.16.2) method_source (1.0.0) mini_magick (4.11.0) @@ -336,6 +338,20 @@ GEM ruby2_keywords (~> 0.0.1) net-http-persistent (4.0.1) connection_pool (~> 2.2) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.1.3) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout nio4r (2.5.7) nokogiri (1.11.3) mini_portile2 (~> 2.5.0) @@ -346,7 +362,6 @@ GEM ast (~> 2.4.1) path_expander (1.1.0) pg (1.3.0.rc1) - psych (3.3.2) public_suffix (4.0.6) puma (5.2.2) nio4r (~> 2.0) @@ -473,6 +488,7 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.4.2) stackprof (0.2.17) + strscan (3.0.2) sucker_punch (3.0.1) concurrent-ruby (~> 1.0) thin (1.8.0) @@ -481,6 +497,7 @@ GEM rack (>= 1, < 3) thor (1.1.0) tilt (2.0.10) + timeout (0.2.0) trailblazer-option (0.1.1) turbolinks (5.2.1) turbolinks-source (~> 5.2) @@ -543,6 +560,7 @@ DEPENDENCIES dalli delayed_job delayed_job_active_record + digest (~> 3.1.0.pre) google-cloud-storage (~> 1.11) hiredis image_processing (~> 1.2) @@ -550,11 +568,15 @@ DEPENDENCIES kindlerb (~> 1.2.0) libxml-ruby listen (~> 3.3) + matrix minitest (>= 5.15.0) minitest-bisect minitest-reporters minitest-retry mysql2 (~> 0.5)! + net-imap + net-pop + net-smtp nokogiri (>= 1.8.1) pg (>= 1.3.0.rc1) psych (~> 3.0) diff --git a/RAILS_VERSION b/RAILS_VERSION index ae1c6dc5c63e8..f30a6d00de1d9 100644 --- a/RAILS_VERSION +++ b/RAILS_VERSION @@ -1 +1 @@ -6.1.5.1 +6.1.6 diff --git a/actioncable/lib/action_cable/gem_version.rb b/actioncable/lib/action_cable/gem_version.rb index 3c561f92978c8..3354ac68eb47d 100644 --- a/actioncable/lib/action_cable/gem_version.rb +++ b/actioncable/lib/action_cable/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 5 - PRE = "1" + TINY = 6 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actioncable/package.json b/actioncable/package.json index abe4d5503c6b0..6af9baf16bb6c 100644 --- a/actioncable/package.json +++ b/actioncable/package.json @@ -1,6 +1,6 @@ { "name": "@rails/actioncable", - "version": "6.1.5-1", + "version": "6.1.6", "description": "WebSocket framework for Ruby on Rails.", "main": "app/assets/javascripts/action_cable.js", "files": [ diff --git a/actionmailbox/lib/action_mailbox/gem_version.rb b/actionmailbox/lib/action_mailbox/gem_version.rb index 0483b46ecf6b0..58d5e66a231be 100644 --- a/actionmailbox/lib/action_mailbox/gem_version.rb +++ b/actionmailbox/lib/action_mailbox/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 5 - PRE = "1" + TINY = 6 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb index 9c260eab45f9a..04635b6e3689a 100644 --- a/actionmailer/lib/action_mailer/gem_version.rb +++ b/actionmailer/lib/action_mailer/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 5 - PRE = "1" + TINY = 6 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb index 104f60f956d34..52691072f5640 100644 --- a/actionpack/lib/action_pack/gem_version.rb +++ b/actionpack/lib/action_pack/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 5 - PRE = "1" + TINY = 6 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actiontext/lib/action_text/gem_version.rb b/actiontext/lib/action_text/gem_version.rb index 2c07a6d225812..6ac5430fdd55c 100644 --- a/actiontext/lib/action_text/gem_version.rb +++ b/actiontext/lib/action_text/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 5 - PRE = "1" + TINY = 6 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actiontext/package.json b/actiontext/package.json index 64ffcf0c913f7..666add3fa92a4 100644 --- a/actiontext/package.json +++ b/actiontext/package.json @@ -1,6 +1,6 @@ { "name": "@rails/actiontext", - "version": "6.1.5-1", + "version": "6.1.6", "description": "Edit and display rich text in Rails applications", "main": "app/javascript/actiontext/index.js", "files": [ diff --git a/actionview/lib/action_view/gem_version.rb b/actionview/lib/action_view/gem_version.rb index e50a692485415..497efa4f79109 100644 --- a/actionview/lib/action_view/gem_version.rb +++ b/actionview/lib/action_view/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 5 - PRE = "1" + TINY = 6 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actionview/package.json b/actionview/package.json index b8ccbad534ea0..e58b1ce65ff84 100644 --- a/actionview/package.json +++ b/actionview/package.json @@ -1,6 +1,6 @@ { "name": "@rails/ujs", - "version": "6.1.5-1", + "version": "6.1.6", "description": "Ruby on Rails unobtrusive scripting adapter", "main": "lib/assets/compiled/rails-ujs.js", "files": [ diff --git a/activejob/lib/active_job/gem_version.rb b/activejob/lib/active_job/gem_version.rb index c7146ab6d5eca..3e6d093220533 100644 --- a/activejob/lib/active_job/gem_version.rb +++ b/activejob/lib/active_job/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 5 - PRE = "1" + TINY = 6 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb index f4af88b7eb1fd..699113181292b 100644 --- a/activemodel/lib/active_model/gem_version.rb +++ b/activemodel/lib/active_model/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 5 - PRE = "1" + TINY = 6 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb index 07cf94b63f087..77f1668d5ada3 100644 --- a/activerecord/lib/active_record/gem_version.rb +++ b/activerecord/lib/active_record/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 5 - PRE = "1" + TINY = 6 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activestorage/lib/active_storage/gem_version.rb b/activestorage/lib/active_storage/gem_version.rb index 43b20fee808db..2df6a65c0d69f 100644 --- a/activestorage/lib/active_storage/gem_version.rb +++ b/activestorage/lib/active_storage/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 5 - PRE = "1" + TINY = 6 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activestorage/package.json b/activestorage/package.json index 918b66dcb6695..72f5c6662cee0 100644 --- a/activestorage/package.json +++ b/activestorage/package.json @@ -1,6 +1,6 @@ { "name": "@rails/activestorage", - "version": "6.1.5-1", + "version": "6.1.6", "description": "Attach cloud and local files in Rails applications", "main": "app/assets/javascripts/activestorage.js", "files": [ diff --git a/activesupport/lib/active_support/gem_version.rb b/activesupport/lib/active_support/gem_version.rb index 9aa3e3a178a0f..a992d2f867fb8 100644 --- a/activesupport/lib/active_support/gem_version.rb +++ b/activesupport/lib/active_support/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 5 - PRE = "1" + TINY = 6 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/railties/lib/rails/gem_version.rb b/railties/lib/rails/gem_version.rb index 889491af646ec..e982fc9a317ed 100644 --- a/railties/lib/rails/gem_version.rb +++ b/railties/lib/rails/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 5 - PRE = "1" + TINY = 6 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/version.rb b/version.rb index 889491af646ec..e982fc9a317ed 100644 --- a/version.rb +++ b/version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 5 - PRE = "1" + TINY = 6 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end