Merge branch '6-0-2' into 6-0-stable

Gemfile.lock

@@ -17,79 +17,79 @@ GIT
 PATH
   remote: .
   specs:
-    actioncable (6.0.1)
-      actionpack (= 6.0.1)
+    actioncable (6.0.2)
+      actionpack (= 6.0.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.1)
-      actionpack (= 6.0.1)
-      activejob (= 6.0.1)
-      activerecord (= 6.0.1)
-      activestorage (= 6.0.1)
-      activesupport (= 6.0.1)
+    actionmailbox (6.0.2)
+      actionpack (= 6.0.2)
+      activejob (= 6.0.2)
+      activerecord (= 6.0.2)
+      activestorage (= 6.0.2)
+      activesupport (= 6.0.2)
       mail (>= 2.7.1)
-    actionmailer (6.0.1)
-      actionpack (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
+    actionmailer (6.0.2)
+      actionpack (= 6.0.2)
+      actionview (= 6.0.2)
+      activejob (= 6.0.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.1)
-      actionview (= 6.0.1)
-      activesupport (= 6.0.1)
+    actionpack (6.0.2)
+      actionview (= 6.0.2)
+      activesupport (= 6.0.2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.1)
-      actionpack (= 6.0.1)
-      activerecord (= 6.0.1)
-      activestorage (= 6.0.1)
-      activesupport (= 6.0.1)
+    actiontext (6.0.2)
+      actionpack (= 6.0.2)
+      activerecord (= 6.0.2)
+      activestorage (= 6.0.2)
+      activesupport (= 6.0.2)
       nokogiri (>= 1.8.5)
-    actionview (6.0.1)
-      activesupport (= 6.0.1)
+    actionview (6.0.2)
+      activesupport (= 6.0.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.1)
-      activesupport (= 6.0.1)
+    activejob (6.0.2)
+      activesupport (= 6.0.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.1)
-      activesupport (= 6.0.1)
-    activerecord (6.0.1)
-      activemodel (= 6.0.1)
-      activesupport (= 6.0.1)
-    activestorage (6.0.1)
-      actionpack (= 6.0.1)
-      activejob (= 6.0.1)
-      activerecord (= 6.0.1)
+    activemodel (6.0.2)
+      activesupport (= 6.0.2)
+    activerecord (6.0.2)
+      activemodel (= 6.0.2)
+      activesupport (= 6.0.2)
+    activestorage (6.0.2)
+      actionpack (= 6.0.2)
+      activejob (= 6.0.2)
+      activerecord (= 6.0.2)
       marcel (~> 0.3.1)
-    activesupport (6.0.1)
+    activesupport (6.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2)
-    rails (6.0.1)
-      actioncable (= 6.0.1)
-      actionmailbox (= 6.0.1)
-      actionmailer (= 6.0.1)
-      actionpack (= 6.0.1)
-      actiontext (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
-      activemodel (= 6.0.1)
-      activerecord (= 6.0.1)
-      activestorage (= 6.0.1)
-      activesupport (= 6.0.1)
+    rails (6.0.2)
+      actioncable (= 6.0.2)
+      actionmailbox (= 6.0.2)
+      actionmailer (= 6.0.2)
+      actionpack (= 6.0.2)
+      actiontext (= 6.0.2)
+      actionview (= 6.0.2)
+      activejob (= 6.0.2)
+      activemodel (= 6.0.2)
+      activerecord (= 6.0.2)
+      activestorage (= 6.0.2)
+      activesupport (= 6.0.2)
       bundler (>= 1.3.0)
-      railties (= 6.0.1)
+      railties (= 6.0.2)
       sprockets-rails (>= 2.0.0)
-    railties (6.0.1)
-      actionpack (= 6.0.1)
-      activesupport (= 6.0.1)
+    railties (6.0.2)
+      actionpack (= 6.0.2)
+      activesupport (= 6.0.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -296,7 +296,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.3.1)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -521,12 +521,10 @@ GEM
     websocket (1.2.8)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-driver (0.7.1-java)
-      websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.2.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   java

RAILS_VERSION

-6.0.1
+6.0.2

actioncable/CHANGELOG.md

+## Rails 6.0.2 (December 13, 2019) ##
+
+*   No changes.
+
+
 ## Rails 6.0.1 (November 5, 2019) ##
 
 *   No changes.

actioncable/lib/action_cable/gem_version.rb

@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

actioncable/package.json

 {
   "name": "@rails/actioncable",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "WebSocket framework for Ruby on Rails.",
   "main": "app/assets/javascripts/action_cable.js",
   "files": [

actionmailbox/CHANGELOG.md

+## Rails 6.0.2 (December 13, 2019) ##
+
+*   No changes.
+
+
 ## Rails 6.0.1 (November 5, 2019) ##
 
 *   No changes.

actionmailbox/lib/action_mailbox/gem_version.rb

@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

actionmailer/CHANGELOG.md

+## Rails 6.0.2 (December 13, 2019) ##
+
 *   Fix ActionMailer assertions don't work for parameterized mail with legacy delivery job.
 
     *bogdanvlviv*

actionmailer/lib/action_mailer/gem_version.rb

@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

actionpack/CHANGELOG.md

+## Rails 6.0.2 (December 13, 2019) ##
+
 *   Allow using mountable engine route helpers in System Tests.
 
     *Chalo Fernandez*

actionpack/lib/action_controller/metal/request_forgery_protection.rb

@@ -280,7 +280,7 @@ def marked_for_same_origin_verification? # :doc:
 
       # Check for cross-origin JavaScript responses.
       def non_xhr_javascript_response? # :doc:
-        media_type && %r(\A(?:text|application)/javascript).match?(media_type) && !request.xhr?
+        %r(\A(?:text|application)/javascript).match?(media_type) && !request.xhr?
       end
 
       AUTHENTICITY_TOKEN_LENGTH = 32

actionpack/lib/action_dispatch/http/mime_type.rb

@@ -231,7 +231,7 @@ def unregister(symbol)
     class InvalidMimeType < StandardError; end
 
     def initialize(string, symbol = nil, synonyms = [])
-      if string.nil? || ! MIME_REGEXP.match?(string)
+      unless MIME_REGEXP.match?(string)
         raise InvalidMimeType, "#{string.inspect} is not a valid MIME type"
       end
       @symbol, @synonyms = symbol, synonyms

actionpack/lib/action_dispatch/http/request.rb

@@ -264,8 +264,7 @@ def content_length
     # (case-insensitive), which may need to be manually added depending on the
     # choice of JavaScript libraries and frameworks.
     def xml_http_request?
-      header = get_header("HTTP_X_REQUESTED_WITH")
-      header && /XMLHttpRequest/i.match?(header)
+      get_header("HTTP_X_REQUESTED_WITH") =~ /XMLHttpRequest/i
     end
     alias :xhr? :xml_http_request?
 

actionpack/lib/action_dispatch/journey/formatter.rb

@@ -151,7 +151,7 @@ def missing_keys(route, parts)
                 missing_keys << key
               end
             else
-              if parts[key].nil? || !/\A#{tests[key]}\Z/.match?(parts[key])
+              unless /\A#{tests[key]}\Z/ === parts[key]
                 missing_keys ||= []
                 missing_keys << key
               end

actionpack/lib/action_dispatch/routing/mapper.rb

@@ -341,7 +341,7 @@ def check_part(name, part, path_params, hash)
           end
 
           def split_to(to)
-            if to && /#/.match?(to)
+            if /#/.match?(to)
               to.split("#")
             else
               []
@@ -350,7 +350,7 @@ def split_to(to)
 
           def add_controller_module(controller, modyoule)
             if modyoule && !controller.is_a?(Regexp)
-              if controller && controller.to_s.start_with?("/")
+              if %r{\A/}.match?(controller)
                 controller[1..-1]
               else
                 [modyoule, controller].compact.join("/")

actionpack/lib/action_pack/gem_version.rb

@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

actiontext/CHANGELOG.md

+## Rails 6.0.2 (December 13, 2019) ##
+
+*   No changes.
+
+
 ## Rails 6.0.1 (November 5, 2019) ##
 
 *   No changes.

actiontext/lib/action_text/gem_version.rb

@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

actiontext/package.json

 {
   "name": "@rails/actiontext",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "Edit and display rich text in Rails applications",
   "main": "app/javascript/actiontext/index.js",
   "files": [

actionview/CHANGELOG.md

+## Rails 6.0.2 (December 13, 2019) ##
+
+*   No changes.
+
+
 ## Rails 6.0.1 (November 5, 2019) ##
 
 *   UJS avoids `Element.closest()` for IE 9 compatibility.

actionview/lib/action_view/gem_version.rb

@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

actionview/lib/action_view/layouts.rb

@@ -280,11 +280,7 @@ def layout(layout, conditions = {})
       def _write_layout_method # :nodoc:
         silence_redefinition_of_method(:_layout)
 
-        prefixes = if _implied_layout_name && /\blayouts/.match?(_implied_layout_name)
-          []
-        else
-          ["layouts"]
-        end
+        prefixes = /\blayouts/.match?(_implied_layout_name) ? [] : ["layouts"]
         default_behavior = "lookup_context.find_all('#{_implied_layout_name}', #{prefixes.inspect}, false, [], { formats: formats }).first || super"
         name_clause = if name
           default_behavior

actionview/package.json

 {
   "name": "@rails/ujs",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "Ruby on Rails unobtrusive scripting adapter",
   "main": "lib/assets/compiled/rails-ujs.js",
   "files": [

activejob/CHANGELOG.md

+## Rails 6.0.2 (December 13, 2019) ##
+
 *   Allow Sidekiq access to the underlying job class.
 
     By having access to the Active Job class, Sidekiq can get access to any `sidekiq_options` which

activejob/lib/active_job/gem_version.rb

@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

activemodel/CHANGELOG.md

+## Rails 6.0.2 (December 13, 2019) ##
+
+*   No changes.
+
+
 ## Rails 6.0.1 (November 5, 2019) ##
 
 *   No changes.

activemodel/lib/active_model/gem_version.rb

@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

activemodel/test/validators/email_validator.rb

@@ -2,8 +2,7 @@
 
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    if value.nil? || ! /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i.match?(value)
-      record.errors[attribute] << (options[:message] || "is not an email")
-    end
+    record.errors[attribute] << (options[:message] || "is not an email") unless
+      /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i.match?(value)
   end
 end

activerecord/CHANGELOG.md

+<<<<<<< HEAD
 *   A database URL can now contain a querystring value that contains an equal sign. This is needed to support passing PostgresSQL `options`.
 
      *Joshua Flanagan*
@@ -8,13 +9,16 @@
 
     *Patrick Rebsch*
 
+
+## Rails 6.0.2 (December 13, 2019) ##
+
 *   Share the same connection pool for primary and replica databases in the
     transactional tests for the same database.
 
     *Edouard Chin*
 
 *   Fix the preloader when one record is fetched using `after_initialize`
-    but not the entire colection.
+    but not the entire collection.
 
     *Bradley Price*
 

activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -85,9 +85,7 @@ class AbstractAdapter
       set_callback :checkin, :after, :enable_lazy_transactions!
 
       def self.type_cast_config_to_integer(config)
-        if config.nil?
-          config
-        elsif config.is_a?(Integer)
+        if config.is_a?(Integer)
           config
         elsif SIMPLE_INT.match?(config)
           config.to_i

activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb

@@ -162,7 +162,7 @@ def new_column_from_field(table_name, field)
             type_metadata = fetch_type_metadata(field[:Type], field[:Extra])
             default, default_function = field[:Default], nil
 
-            if type_metadata.type == :datetime && default && /\ACURRENT_TIMESTAMP(?:\([0-6]?\))?\z/i.match?(default)
+            if type_metadata.type == :datetime && /\ACURRENT_TIMESTAMP(?:\([0-6]?\))?\z/i.match?(default)
               default, default_function = nil, default
             elsif type_metadata.extra == "DEFAULT_GENERATED"
               default = +"(#{default})" unless default.start_with?("(")

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -616,7 +616,7 @@ def extract_default_function(default_value, default)
         end
 
         def has_default_function?(default_value, default)
-          !default_value && default && %r{\w+\(.*\)|\(.*\)::\w+|CURRENT_DATE|CURRENT_TIMESTAMP}.match?(default)
+          !default_value && %r{\w+\(.*\)|\(.*\)::\w+|CURRENT_DATE|CURRENT_TIMESTAMP}.match?(default)
         end
 
         def load_additional_types(oids = nil)

activerecord/lib/active_record/gem_version.rb

@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

activestorage/CHANGELOG.md

+## Rails 6.0.2 (December 13, 2019) ##
+
+*   No changes.
+
+
 ## Rails 6.0.1 (November 5, 2019) ##
 
 *   `ActiveStorage::AnalyzeJob`s are discarded on `ActiveRecord::RecordNotFound` errors.

activestorage/lib/active_storage/gem_version.rb

@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

activestorage/package.json

 {
   "name": "@rails/activestorage",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "Attach cloud and local files in Rails applications",
   "main": "app/assets/javascripts/activestorage.js",
   "files": [

activesupport/CHANGELOG.md

+## Rails 6.0.2 (December 13, 2019) ##
+
 *   Eager load translations during initialization.
 
     *Diego Plentz*

activesupport/lib/active_support/gem_version.rb

@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

guides/CHANGELOG.md

+## Rails 6.0.2 (December 13, 2019) ##
+
+*   No changes.
+
+
 ## Rails 6.0.1 (November 5, 2019) ##
 
 *   No changes.

railties/CHANGELOG.md

+## Rails 6.0.2 (December 13, 2019) ##
+
 *   Fix the collision check for the scaffold generator.
 
     *Ryan Robeson*

railties/lib/rails/gem_version.rb

@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

tasks/release.rb

@@ -139,7 +139,8 @@
   task :release_summary, [:base_release, :release] do |_, args|
     release_regexp = args[:base_release] ? Regexp.escape(args[:base_release]) : /\d+\.\d+\.\d+/
 
-    puts release
+    puts args[:release]
+    puts
 
     FRAMEWORKS.each do |fw|
       puts "## #{FRAMEWORK_NAMES[fw]}"

version.rb

@@ -9,7 +9,7 @@ def self.gem_version
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")