aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'spastorino/master'Carl Lerche2010-04-183-3/+5
|\
| * Missing require addedSantiago Pastorino2010-04-181-0/+1
| * perform_caching should be accessed through the controller hereSantiago Pastorino2010-04-171-1/+1
| * perform_caching is now delegated to config on instance and class levelSantiago Pastorino2010-04-171-2/+3
* | Merge branch 'master' of github.com:rails/railsCarl Lerche2010-04-189-7/+37
|\|
| * added shorthand support for routes like /projects/status(.:format)Diego Carrion2010-04-173-3/+14
| * access assigns as a method or hash, with strings or symbols [#4431 state:reso...David Chelimsky2010-04-172-2/+18
| * fisting codes so it will parse [#4430 state:resolved]Aaron Patterson2010-04-171-2/+2
| * Added missing requireSantiago Pastorino2010-04-161-0/+1
| * Missing requireswycats2010-04-162-0/+2
* | mail_to with :encode => :javascript now outputs safe htmlSam Elliott2010-04-162-3/+7
|/
* Revert "Avoid deprecation warnings and potential TypeErrors [#4404 state:reso...Carl Lerche2010-04-163-4/+3
* Mark the result of grouped_options_for_select as HTML safe [#4322 state:commi...Kieran Pilkington2010-04-162-1/+5
* Bump rack-mount dependency to ~> 0.6.3 for CRITICAL FIXJeremy Kemper2010-04-161-1/+1
* Revert "Require rack-mount 0.6.0 since 0.6.1 and later can't be bundled"Jeremy Kemper2010-04-161-1/+1
* page_cache_extension is delegating to config so no need to deprecateSantiago Pastorino2010-04-161-1/+0
* Added test get to js should have a header with content-type text/javascriptSantiago Pastorino2010-04-161-1/+8
* Tidy up a bit this test fileSantiago Pastorino2010-04-161-7/+2
* Revert "Add test case which check content type when rendering rjs" partial in...Santiago Pastorino2010-04-161-9/+1
* add missing requires to Rescuable and RouteSet [#4415 state:committed]Mislav Marohnić2010-04-161-0/+1
* Make perform_caching work again, with the tests passing and backward compatibleSantiago Pastorino and Carl Lerche2010-04-156-26/+25
* Revert "logger added to the deprecated config accessor" we need a major refac...Santiago Pastorino and Carl Lerche2010-04-151-1/+0
* Avoid deprecation warnings and potential TypeErrors [#4404 state:resolved]Nicolas Sanguinetti2010-04-152-3/+3
* logger added to the deprecated config accessorSantiago Pastorino2010-04-141-0/+1
* protected instance variables added to the deprecated config accessorSantiago Pastorino2010-04-141-0/+1
* asset and helper path added to the deprecated config accessorSantiago Pastorino2010-04-141-0/+2
* page_cache added to the deprecated config accessorSantiago Pastorino2010-04-141-3/+6
* Make use of config.perform_cachingSantiago Pastorino2010-04-143-7/+7
* action_dispatch/routing/deprecated_mapper needs with_optionsMatthew Rudy Jacobs2010-04-141-0/+1
* Fix missing dependency on Hash#to_querySantiago Pastorino2010-04-141-0/+1
* Require rack-mount 0.6.0 since 0.6.1 and later can't be bundledJeremy Kemper2010-04-141-1/+1
* Merge commit 'docrails/master'Xavier Noria2010-04-141-1/+1
|\
| * Replace 'RAILS_ROOT' to 'Rails.root' and 'RAILS_ENV' to 'Rails.env' in signif...Anil Wadghule2010-04-121-1/+1
* | Changed translate helper so that it doesn’t mark every translation as safe ...Craig Davey2010-04-134-5/+45
* | config.perform_caching added to the deprecated config accessor [#4383 state:c...Santiago Pastorino2010-04-131-1/+2
* | Merge branch 'master' of github.com:rails/railswycats2010-04-132-2/+2
|\ \
| * | Use correct RUBY_PLATFORM regex for Windows env [#4385 state:resolved]Anil Wadghule2010-04-131-1/+1
| * | Update changelogs for releaseDavid Heinemeier Hansson2010-04-131-1/+1
* | | Add test case which check content type when rendering rjs partial in html tem...Stanko Alexander2010-04-131-1/+9
|/ /
* | Add a test that used to fail but is fixed now [#3417 state:resolved]wycats2010-04-121-0/+1
* | Fix a typo in the documentation. [#4318 state:resolved]Craig R Webster2010-04-121-1/+1
* | Fix a bug in url generation for generic routes.José Valim2010-04-122-2/+21
* | Ensure match path, :controller => name works as expected.José Valim2010-04-122-2/+13
* | Let capture handle the yielding.José Valim2010-04-121-4/+1
* | Fix ActionMailer test broken in 99d54599215c2a8cea7e57f609e8e578043d71b2José Valim2010-04-122-5/+11
* | fields_for returns block result when outside ERBRyan Bates2010-04-112-1/+6
* | Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-04-111-13/+55
|\ \
| * | your beloved typo only spotted in github diff no matter how careful you were ...Xavier Noria2010-04-111-1/+1
| * | second pass to the intro rdoc of form_helper.rbXavier Noria2010-04-111-13/+55
* | | Make namespace work with options[:to] [#4351 state:committed]Santiago Pastorino2010-04-112-2/+10
|/ /