aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Clean up the config object in ActionPack. Create config_accessor which just ↵José Valim2010-04-2215-206/+99
| | | | delegates to the config object, reducing the number of deprecations and add specific tests.
* params already has a setted controller and action hereSantiago Pastorino2010-04-211-1/+0
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* url_for now works with HashWithIndifferentAccess ht jay [#4391 state:committed]Santiago Pastorino2010-04-212-1/+11
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Some require indifferent_access addedSantiago Pastorino2010-04-214-1/+5
| | | | Signed-off-by: Xavier Noria <fxn@ubuntu.(none)>
* require without .rbSantiago Pastorino2010-04-211-1/+1
| | | | Signed-off-by: Xavier Noria <fxn@ubuntu.(none)>
* It should be possible to render :json with optionswycats2010-04-201-1/+1
|
* Remove only formats in shortcuts and do it just once.José Valim2010-04-201-4/+5
|
* 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
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * access assigns as a method or hash, with strings or symbols [#4431 ↵David Chelimsky2010-04-172-2/+18
| | | | | | | | state:resolved]
| * fisting codes so it will parse [#4430 state:resolved]Aaron Patterson2010-04-171-2/+2
| | | | | | | | Signed-off-by: wycats <wycats@gmail.com>
| * 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
|/ | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
* Revert "Avoid deprecation warnings and potential TypeErrors [#4404 ↵Carl Lerche2010-04-163-4/+3
| | | | | | | state:resolved]" Revert "protected instance variables added to the deprecated config accessor This reverts commit 4bce5ba600596b5e7afec9b097866ac259c5940a and 0ee2d3c89a893f0c53924cbb756c7e9be616eb8f.
* Mark the result of grouped_options_for_select as HTML safe [#4322 ↵Kieran Pilkington2010-04-162-1/+5
| | | | | | state:committed] Signed-off-by: Xavier Noria <fxn@hashref.com>
* 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
| | | | | | They can be bundled. Just the git repos can't. Use rails/rack-mount for that. This reverts commit ef6cdc974f7c3d98eb0a3ad65761e10600f04110.
* 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 ↵Santiago Pastorino2010-04-161-9/+1
| | | | | | in html template" rendering rjs in html doesn't make sense, it would just output javascript into the template, no script tag This reverts commit dc251389d1ab4303b80a22642f4241940b73cbe7.
* add missing requires to Rescuable and RouteSet [#4415 state:committed]Mislav Marohnić2010-04-161-0/+1
| | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* 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 ↵Santiago Pastorino and Carl Lerche2010-04-151-1/+0
| | | | | | refactor to get this working This reverts commit 68f4e046a7f5db3f7c48a3721bead73a625b6f6e.
* Avoid deprecation warnings and potential TypeErrors [#4404 state:resolved]Nicolas Sanguinetti2010-04-152-3/+3
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* 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
| | | | | | [#4398 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fix missing dependency on Hash#to_querySantiago Pastorino2010-04-141-0/+1
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* 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 ↵Anil Wadghule2010-04-121-1/+1
| | | | | | | | significant places.
* | Changed translate helper so that it doesn’t mark every translation as safe ↵Craig Davey2010-04-134-5/+45
| | | | | | | | | | | | HTML. Only keys with a "_html" suffix and keys named "html" are considered to be safe HTML. All other translations are left untouched. Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | config.perform_caching added to the deprecated config accessor [#4383 ↵Santiago Pastorino2010-04-131-1/+2
| | | | | | | | | | | | state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | 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
| | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | Update changelogs for releaseDavid Heinemeier Hansson2010-04-131-1/+1
| | |
* | | Add test case which check content type when rendering rjs partial in html ↵Stanko Alexander2010-04-131-1/+9
|/ / | | | | | | | | | | template Signed-off-by: wycats <wycats@gmail.com>
* | 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
| | | | | | Signed-off-by: wycats <wycats@gmail.com>
* | 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
| |