1 files changed, 22 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 02aea8d21f..03e8d73ea7 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,25 @@
+*   Fix DateTime comparison with DateTime::Infinity object.
+
+    *Rafael Mendonça França*
+
+*   Added Object#itself which returns the object itself. Useful when dealing with a chaining scenario, like Active Record scopes:
+
+        Event.public_send(state.presence_in([ :trashed, :drafted ]) || :itself).order(:created_at)
+
+    *DHH*
+
+*   `Object#with_options` executes block in merging option context when
+    explicit receiver in not passed.
+
+    *Pavel Pravosud*
+
+*   Fixed a compatibility issue with the `Oj` gem when cherry-picking the file
+    `active_support/core_ext/object/json` without requiring `active_support/json`.
+
+    Fixes #16131.
+
+    *Godfrey Chan*
+
 *   Make `Hash#with_indifferent_access` copy the default proc too.
 
     *arthurnn*, *Xanders*