aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-21 06:29:19 -0800
committerJosé Valim <jose.valim@gmail.com>2011-12-21 06:29:19 -0800
commite56043e5f8fdc8422cc3455393a55fd08fd60ccf (patch)
treee363ce99f004a03246fc878d66a5b976298e84e2
parent618cb4429191290b957391c314a55b4d59f381f3 (diff)
parent9f44e27fc57a0f4109eb3ea9b450a2435a1d771f (diff)
downloadrails-e56043e5f8fdc8422cc3455393a55fd08fd60ccf.tar.gz
rails-e56043e5f8fdc8422cc3455393a55fd08fd60ccf.tar.bz2
rails-e56043e5f8fdc8422cc3455393a55fd08fd60ccf.zip
Merge pull request #4100 from simi/master
rails version order in railties changelog
-rw-r--r--railties/CHANGELOG.md26
1 files changed, 13 insertions, 13 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 0bd76df6d7..555d466ca4 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -32,19 +32,6 @@
* Remove old 'config.paths.app.controller' API in favor of 'config.paths["app/controller"]' API *Guillermo Iguaran*
-* Rails 3.1.1
-
-* Add jquery-rails to Gemfile of plugins, test/dummy app needs it. Closes #3091. *Santiago Pastorino*
-
-* Add config.assets.initialize_on_precompile which, when set to false, forces
- `rake assets:precompile` to load the application but does not initialize it.
-
- To the app developer, this means configuration add in
- config/initializers/* will not be executed.
-
- Plugins developers need to special case their initializers that are
- meant to be run in the assets group by adding :group => :assets.
-
## Rails 3.1.2 (unreleased) ##
* Engines: don't blow up if db/seeds.rb is missing.
@@ -55,6 +42,19 @@
*GH 2564*
*José Valim*
+
+## Rails 3.1.1 ##
+
+* Add jquery-rails to Gemfile of plugins, test/dummy app needs it. Closes #3091. *Santiago Pastorino*
+
+* Add config.assets.initialize_on_precompile which, when set to false, forces
+ `rake assets:precompile` to load the application but does not initialize it.
+
+ To the app developer, this means configuration add in
+ config/initializers/* will not be executed.
+
+ Plugins developers need to special case their initializers that are
+ meant to be run in the assets group by adding :group => :assets.
## Rails 3.1.0 (August 30, 2011) ##