aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-07-19 15:14:26 +0200
committerJosé Valim <jose.valim@gmail.com>2010-07-19 15:14:26 +0200
commitb22c11fa533fd523e8cadd36e75dd76b6a9f0488 (patch)
treef0e15df8674bb3057bf70db7ab8ea737ef7106e1
parent70f7ba3e3bf10e1a646ef6ace09da7b2918ba75d (diff)
downloadrails-b22c11fa533fd523e8cadd36e75dd76b6a9f0488.tar.gz
rails-b22c11fa533fd523e8cadd36e75dd76b6a9f0488.tar.bz2
rails-b22c11fa533fd523e8cadd36e75dd76b6a9f0488.zip
Add missing entries and tidy up CHANGELOG.
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--activemodel/CHANGELOG5
-rw-r--r--activerecord/CHANGELOG2
-rw-r--r--railties/CHANGELOG14
4 files changed, 17 insertions, 6 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 32aba2091a..6e07516a58 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*Rails 3.0.0 [Release Candidate] (unreleased)*
+* Allow stylesheet/javascript extensions to be changed through railties. [Josh Kalderimis]
+
* link_to, button_to, and tag/tag_options now rely on html_escape instead of escape_once. [fxn]
* url_for returns always unescaped strings, and the :escape option is gone. [fxn]
diff --git a/activemodel/CHANGELOG b/activemodel/CHANGELOG
index a5e7f300d9..33602657f5 100644
--- a/activemodel/CHANGELOG
+++ b/activemodel/CHANGELOG
@@ -1,3 +1,8 @@
+*Rails 3.0.0 [Release Candidate] (unreleased)*
+
+* Added ActiveModel::MassAssignmentSecurity [Eric Chapweske, Josh Kalderimis]
+
+
*Rails 3.0.0 [beta 4] (June 8th, 2010)*
* JSON supports a custom root option: to_json(:root => 'custom') #4515 [Jatinder Singh]
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index a1a82fdff5..679fdafae8 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*Rails 3.0.0 [RC1] (unreleased)*
+* Changed update_attribute to not run callbacks and update the record directly in the database [Neeraj Singh]
+
* Add scoping and unscoped as the syntax to replace the old with_scope and with_exclusive_scope [José Valim]
* New rake task, db:migrate:status, displays status of migrations #4947 [Kevin Skoglund]
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 8e2bac7f00..bdfaa0decf 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*Rails 3.0.0 [Release Candidate] (unreleased)*
+* Added console to Rails::Railtie as a hook called just after console starts. [José Valim]
+
* Rails no longer autoload code in lib for application. You need to explicitly require it. [José Valim]
* Rails::LogSubscriber was renamed to ActiveSupport::LogSubscriber [José Valim]
@@ -13,26 +15,26 @@
*Rails 3.0.0 [beta 4] (June 8th, 2010)*
-* Version bump
-* Removed Rails Metal [YK & JV].
+* Removed Rails Metal [Yehuda Kayz, José Valim].
+
*Rails 3.0.0 [beta 3] (April 13th, 2010)*
-* Renamed config.cookie_secret to config.secret_token and pass it as env key. [JV]
+* Renamed config.cookie_secret to config.secret_token and pass it as env key. [José Valim]
*Rails 3.0.0 [beta 2] (April 1st, 2010)*
-* Session store configuration has changed [YK & CL]
+* Session store configuration has changed [Yehuda Katz, Carl Lerche]
config.session_store :cookie_store, {:key => "..."}
config.cookie_secret = "fdsfhisdghfidugnfdlg"
* railtie_name and engine_name are deprecated. You can now add any object to
- the configuration object: config.your_plugin = {} [JV]
+ the configuration object: config.your_plugin = {} [José Valim]
* Added config.generators.templates to provide alternative paths for the generators
- to look for templates [JV]
+ to look for templates [José Valim]
*Rails 3.0.0 [beta 1] (February 4, 2010)*