Permalink
Browse files

Remove incorrect master entries from 2-1-stable CHANGELOGs. Mark upco…

…ming stuff as 2.1.1 (next release) instead of Edge.
  • Loading branch information...
jeremy committed Jun 22, 2008
1 parent 3a05ba6 commit 4573b7b63d1a1ac5bafafc55158433f95ed0d835
Showing with 5 additions and 13 deletions.
  1. +1 −5 actionpack/CHANGELOG
  2. +1 −3 activerecord/CHANGELOG
  3. +1 −1 activeresource/CHANGELOG
  4. +1 −1 activesupport/CHANGELOG
  5. +1 −3 railties/CHANGELOG
View
@@ -1,13 +1,9 @@
-*Edge*
+*2.1.1 (next release)*
* Deprecate ActionView::Base.erb_variable. Use the concat helper method instead of appending to it directly. [Jeremy Kemper]
* Fixed Request#remote_ip to only raise hell if the HTTP_CLIENT_IP and HTTP_X_FORWARDED_FOR doesn't match (not just if they're both present) [Mark Imbriaco, Bradford Folkens]
-* Allow caches_action to accept a layout option [José Valim]
-
-* Added Rack processor [Ezra Zygmuntowicz, Josh Peek]
-
*2.1.0 (May 31st, 2008)*
View
@@ -1,11 +1,9 @@
-*Edge*
+*2.1.1 (next release)*
* Add :from option to calculations. #397 [Ben Munat]
* Add :validate option to associations to enable/disable the automatic validation of associated models. Resolves #301. [Jan De Poorter]
-* PostgreSQL: use 'INSERT ... RETURNING id' for 8.2 and later. [Jeremy Kemper]
-
* Added SQL escaping for :limit and :offset in MySQL [Jonathan Wiess]
View
@@ -1,4 +1,4 @@
-*Edge*
+*2.1.1 (next release)*
* Fixed Base#exists? to check status code as integer [#299 state:resolved] (Wes Oldenbeuving)
View
@@ -1,4 +1,4 @@
-*Edge*
+*2.1.1 (next release)*
* Added StringQuestioneer for doing things like StringQuestioneer.new("production").production? # => true and StringQuestioneer.new("production").development? # => false [DHH]
View
@@ -1,6 +1,4 @@
-*Edge*
-
-* Wrapped Rails.env in StringQuestioneer so you can do Rails.env.development? [DHH]
+*2.1.1 (next release)*
* Add the gem load paths before the framework is loaded, so certain gems like RedCloth and BlueCloth can be frozen.

0 comments on commit 4573b7b

Please sign in to comment.