aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-12-26 12:19:09 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-12-26 12:19:09 -0300
commit5d80da812bc950bb36376411d8b47027aa70d0dc (patch)
treec9f0c18a68b4bb926bb28653b38b49ae76a06f12
parente72790c4e7adf5ede082f8c71304c5d9972cf7bc (diff)
downloadrails-5d80da812bc950bb36376411d8b47027aa70d0dc.tar.gz
rails-5d80da812bc950bb36376411d8b47027aa70d0dc.tar.bz2
rails-5d80da812bc950bb36376411d8b47027aa70d0dc.zip
Fix CHANGELOG style [ci skip]
-rw-r--r--actionpack/CHANGELOG.md2
-rw-r--r--activerecord/CHANGELOG.md10
2 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 539b2eec01..57b8b5dfc9 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -2,7 +2,7 @@
* Added `Mime::NullType` class. This allows to use html?, xml?, json?..etc when
the `format` of `request` is unknown, without raise an exception.
-
+
*Angelo Capilleri*
* Integrate the Journey gem into Action Dispatch so that the global namespace
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index e080da9c06..756bad5507 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,10 @@
## Rails 4.0.0 (unreleased) ##
+* `after_commit` and `after_rollback` now validate the `:on` option and raise an `ArgumentError`
+ if it is not one of `:create`, `:destroy` or ``:update`
+
+ *Pascal Friederich*
+
* Improve ways to write `change` migrations, making the old `up` & `down` methods no longer necessary.
* The methods `drop_table` and `remove_column` are now reversible, as long as the necessary information is given.
@@ -22,11 +27,6 @@
*Rafael Mendonça França*
-* after_commit and after_rollback now validate the :on option and raise an ArgumentError if
- it is not one of :create, :destroy or :update
-
- *Pascal Friederich*
-
* Keep index names when using `alter_table` with sqlite3.
Fix #3489.