Fixup CHANGELOGs [ci skip]

actioncable/CHANGELOG.md

@@ -2,4 +2,5 @@
 
     *DHH*
 
+
 Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actioncable/CHANGELOG.md) for previous changes.

actionmailer/CHANGELOG.md

@@ -6,4 +6,5 @@
 
     *Sunny Ripert*
 
+
 Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actionmailer/CHANGELOG.md) for previous changes.

actionpack/CHANGELOG.md

@@ -1,22 +1,24 @@
-*  `respond_to#any` no longer returns a response's Content-Type based on the
-   request format but based on the block given.
+*   `respond_to#any` no longer returns a response's Content-Type based on the
+    request format but based on the block given.
 
-   Example:
+    Example:
 
-   ```ruby
-     def my_action
-       respond_to do |format|
-         format.any { render(json: { foo: 'bar' }) }
-       end
-     end
+    ```ruby
+      def my_action
+        respond_to do |format|
+          format.any { render(json: { foo: 'bar' }) }
+        end
+      end
 
-     get('my_action.csv')
-   ```
-   The previous behaviour was to respond with a `text/csv` Content-Type which
-   is inaccurate since a JSON response is being rendered.
-   Now it correctly returns a `application/json` Content-Type.
+      get('my_action.csv')
+    ```
 
-   * Edouard Chin*
+    The previous behaviour was to respond with a `text/csv` Content-Type which
+    is inaccurate since a JSON response is being rendered.
+
+    Now it correctly returns a `application/json` Content-Type.
+
+    *Edouard Chin*
 
 *   Replaces (back)slashes in failure screenshot image paths with dashes.
 
@@ -25,7 +27,7 @@
 
     *Damir Zekic*
 
-*   Add `params.member?` to mimic Hash behavior
+*   Add `params.member?` to mimic Hash behavior.
 
     *Younes Serraj*
 
@@ -40,7 +42,7 @@
     `remote_ip` to `nil` before setting the header that the value is derived
     from.
 
-    Fixes https://github.com/rails/rails/issues/37383
+    Fixes #37383.
 
     *Norm Provost*
 
@@ -75,7 +77,7 @@
 
     https://github.com/rails/rails/pull/36213
 
-    Fixes #25842
+    Fixes #25842.
 
     *Stan Lo*
 
@@ -92,7 +94,7 @@
 
     *Alberto Fernández-Capel*
 
-*   Add DSL for configuring HTTP Feature Policy
+*   Add DSL for configuring HTTP Feature Policy.
 
     This new DSL provides a way to configure an HTTP Feature Policy at a
     global or per-controller level. Full details of HTTP Feature Policy
@@ -100,9 +102,9 @@
 
     https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Feature-Policy
 
-    Example global policy
+    Example global policy:
 
-    ```
+    ```ruby
     Rails.application.config.feature_policy do |f|
       f.camera      :none
       f.gyroscope   :none
@@ -113,9 +115,9 @@
     end
     ```
 
-    Example controller level policy
+    Example controller level policy:
 
-    ```
+    ```ruby
     class PagesController < ApplicationController
       feature_policy do |p|
         p.geolocation "https://example.com"

actionview/CHANGELOG.md

@@ -36,7 +36,7 @@
 
     *Juanito Fatas*
 
-*   Added `phone_to` helper method to create a link from mobile numbers
+*   Added `phone_to` helper method to create a link from mobile numbers.
 
     *Pietro Moro*
 
@@ -49,7 +49,7 @@
 
     *Guilherme Mansur*, *Gannon McGibbon*
 
-*   `RenderingHelper` supports rendering objects that `respond_to?` `:render_in`
+*   `RenderingHelper` supports rendering objects that `respond_to?` `:render_in`.
 
     *Joel Hawksley*, *Natasha Umer*, *Aaron Patterson*, *Shawn Allen*, *Emily Plummer*, *Diana Mounter*, *John Hawthorn*, *Nathan Herald*, *Zaid Zawaideh*, *Zach Ahn*
 

activejob/CHANGELOG.md

@@ -12,7 +12,9 @@
 
     *Rafael Mendonça França*
 
-*   Changes in `queue_name_prefix` of a job no longer affects all other jobs. Fixes #37084.
+*   Changes in `queue_name_prefix` of a job no longer affects all other jobs.
+
+    Fixes #37084.
 
     *Lucas Mansur*
 
@@ -20,7 +22,7 @@
 
     *Kevin Deisz*
 
-*   Log potential matches in `assert_enqueued_with` and `assert_performed_with`
+*   Log potential matches in `assert_enqueued_with` and `assert_performed_with`.
 
     *Gareth du Plooy*
 

activemodel/CHANGELOG.md

@@ -1,14 +1,16 @@
 *   Raise FrozenError when trying to write attributes that aren't backed by the database on an object that is frozen:
 
         class Animal
-          include ActiveModel::Attributes  
-          attribute :age 
+          include ActiveModel::Attributes
+          attribute :age
         end
-        
+
         animal = Animal.new
-        animal.freeze 
+        animal.freeze
         animal.age = 25 # => FrozenError, "can't modify a frozen Animal"
-          
+
+    *Josh Brody*
+
 *   Add *_previously_was attribute methods when dirty tracking. Example:
 
         pirate.update(catchphrase: "Ahoy!")
@@ -17,4 +19,5 @@
 
     *DHH*
 
+
 Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/activemodel/CHANGELOG.md) for previous changes.

activerecord/CHANGELOG.md

@@ -126,7 +126,7 @@
 
     *Edu Depetris*
 
-*   Make currency symbols optional for money column type in PostgreSQL
+*   Make currency symbols optional for money column type in PostgreSQL.
 
     *Joel Schneider*
 

activestorage/CHANGELOG.md

@@ -16,7 +16,7 @@
 
     *Kyle Ribordy*
 
-*   Allow storage services to be configured per attachment
+*   Allow storage services to be configured per attachment.
 
     ```ruby
     class User < ActiveRecord::Base

activesupport/CHANGELOG.md

@@ -34,22 +34,21 @@
         small_duration_from_int = ActiveSupport::Duration.build(9)
 
         large_duration_from_string > small_duration_from_string
-            => false
+        # => false
 
         small_duration_from_string == small_duration_from_int
-            => false
+        # => false
 
         small_duration_from_int < large_duration_from_string
-            => ArgumentError (comparison of ActiveSupport::Duration::Scalar
-                    with ActiveSupport::Duration failed)
+        # => ArgumentError (comparison of ActiveSupport::Duration::Scalar with ActiveSupport::Duration failed)
 
         large_duration_from_string > small_duration_from_int
-            => ArgumentError (comparison of String with ActiveSupport::Duration failed)
+        # => ArgumentError (comparison of String with ActiveSupport::Duration failed)
 
     After:
 
         small_duration_from_string = ActiveSupport::Duration.build('9')
-            => TypeError (can't build an ActiveSupport::Duration from a String)
+        # => TypeError (can't build an ActiveSupport::Duration from a String)
 
     *Alexei Emam*
 
@@ -62,7 +61,7 @@
 
     *Wojciech Wnętrzak*
 
-*   Allow initializing `thread_mattr_*` attributes via `:default` option
+*   Allow initializing `thread_mattr_*` attributes via `:default` option.
 
         class Scraper
           thread_mattr_reader :client, default: Api::Client.new
@@ -71,11 +70,11 @@
     *Guilherme Mansur*
 
 *   Add `compact_blank` for those times when you want to remove #blank? values from
-    an Enumerable (also `compact_blank!` on Hash, Array, ActionController::Parameters)
+    an Enumerable (also `compact_blank!` on Hash, Array, ActionController::Parameters).
 
     *Dana Sherson*
 
-*   Make ActiveSupport::Logger Fiber-safe. Fixes #36752.
+*   Make ActiveSupport::Logger Fiber-safe.
 
     Use `Fiber.current.__id__` in `ActiveSupport::Logger#local_level=` in order
     to make log level local to Ruby Fibers in addition to Threads.
@@ -84,14 +83,14 @@
 
         logger = ActiveSupport::Logger.new(STDOUT)
         logger.level = 1
-        p "Main is debug? #{logger.debug?}"
+        puts "Main is debug? #{logger.debug?}"
 
         Fiber.new {
           logger.local_level = 0
-          p "Thread is debug? #{logger.debug?}"
+          puts "Thread is debug? #{logger.debug?}"
         }.resume
 
-        p "Main is debug? #{logger.debug?}"
+        puts "Main is debug? #{logger.debug?}"
 
     Before:
 
@@ -105,6 +104,8 @@
         Thread is debug? true
         Main is debug? false
 
+    Fixes #36752.
+
     *Alexander Varnin*
 
 *   Allow the `on_rotation` proc used when decrypting/verifying a message to be

guides/source/upgrading_ruby_on_rails.md

@@ -100,7 +100,7 @@ If your application relies on the previous incorrect behaviour, you are encourag
 which formats your action accepts, i.e.
 
 ```ruby
-   format.any(:xml, :json) { render request.format.to_sym => @people }
+  format.any(:xml, :json) { render request.format.to_sym => @people }
 ```
 
 

railties/CHANGELOG.md

@@ -1,5 +1,6 @@
-* Support using environment variable to set pidfile
+*   Support using environment variable to set pidfile.
+
+    *Ben Thorner*
 
-  *Ben Thorner*
 
 Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/railties/CHANGELOG.md) for previous changes.