1 files changed, 30 insertions, 6 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index 10f1de6706..16b1b50cb3 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,12 +1,36 @@
-*   Removed deprecated `:tokenizer` in the length validator.
+*   Fix methods `#keys`, `#values` in `ActiveModel::Errors`.
 
-    *Rafael Mendonça França*
+    Change `#keys` to only return the keys that don't have empty messages.
 
-*   Removed deprecated methods in `ActiveModel::Errors`.
+    Change `#values` to only return the not empty values.
 
-    `#get`, `#set`, `[]=`, `add_on_empty` and `add_on_blank`.
+     Example:
 
-    *Rafael Mendonça França*
+         # Before
+         person = Person.new
+         person.errors.keys     # => []
+         person.errors.values   # => []
+         person.errors.messages # => {}
+         person.errors[:name]   # => []
+         person.errors.messages # => {:name => []}
+         person.errors.keys     # => [:name]
+         person.errors.values   # => [[]]
 
+         # After
+         person = Person.new
+         person.errors.keys     # => []
+         person.errors.values   # => []
+         person.errors.messages # => {}
+         person.errors[:name]   # => []
+         person.errors.messages # => {:name => []}
+         person.errors.keys     # => []
+         person.errors.values   # => []
 
-Please check [5-0-stable](https://github.com/rails/rails/blob/5-0-stable/activemodel/CHANGELOG.md) for previous changes.
+    *bogdanvlviv*
+
+*   Avoid converting integer as a string into float.
+
+    *namusyaka*
+
+
+Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/activemodel/CHANGELOG.md) for previous changes.