git clone git://github.com/rails/rails.git
Update versions for release
Backport fix to allow :controller=>:some_symbol [norbert]
Backport: allow array and hash query parameters. Array route parameters are converted/to/a/path as before. Closes #7047.
Correct RAILS_GEM_VERSION regexp. Use =version gem requirement instead of ~>version so you don't get surprised by a beta gem in production. This change means upgrading to 1.2.5 will require a boot.rb upgrade.
Add deprecation warning for calling .create on has_many associations with an unsaved owner.
Fix tests broken by earlier change
Make sure acts_as_list's remove_from_list and in_list? play nicely with one another. Closes #8822 [mikel]
Fix unescaped test expectations. Closes #9821 [mikel]
Improve README documentation. Closes #8770 [mikel]
Move custom inflections example so available before route generation. Closes #6829.
Create layout dir it's nested. Closes #9272 [alancfrancis]
Fix in place editor's setter action with non-string fields. References #7418.
Ensure json tests run in stable.
Actually add the file referenced in [7730]
Merge rake routes to stable to help people upgrading.
Forgotten changelog entry
Disable non-cookie sessions to prevent Session Fixation Attacks. Closes #7952 [bradediger]
Change the resource seperator from ; to / change the generated routes to use the new-style named routes. e.g. new_group_user_path(@group) instead of group_new_user_path(@group). [pixeltrix] Closes #8558
Merge sqlite test fixes from trunk
Silence mocha warnings
Revert [7414] which rearranged stable resource URLs. References #8558.
Added new new_admin_products_url named route in addition to old admin_new_products_url syntax. latter syntax got a deprecation warning [pixeltrix]
Merge 8801 fix to stable. Closes #8801
Don't clobber :includes passed to count on has_many association. Closes #9175 [danger]
Merge [7235] to stable. References #9167 [danger]
Ensure TestRequest#request_uri returns the right value when doing multiple GETs. Closes #4867 [alisdair@randomoracle.org, mpalmer]
Integration tests: introduce methods for other HTTP methods. Closes #6353. Merges [6203]
Merge gem freezing fix to stable.
Improve performance of action caching. Closes #8231 [skaes]
