Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix render :xml test (ht Simo Niemelä) | José Valim | 2010-04-24 | 1 | -2/+2 |
| | |||||
* | HWIA symbolize_keys now returns a hash so no need to do this anymore | Santiago Pastorino | 2010-04-22 | 1 | -1/+1 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Make ActionDispatch url_for use HWIA symbolize_keys | Santiago Pastorino | 2010-04-22 | 2 | -4/+8 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Ensure that url_for uses symbolized keys in the controller. [#4391] | J Smith | 2010-04-22 | 2 | -1/+11 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Always downstream given options in :json, :xml and :js renderers and add ↵ | José Valim | 2010-04-22 | 3 | -9/+37 |
| | | | | tests for it. | ||||
* | Clean up the config object in ActionPack. Create config_accessor which just ↵ | José Valim | 2010-04-22 | 15 | -206/+99 |
| | | | | delegates to the config object, reducing the number of deprecations and add specific tests. | ||||
* | params already has a setted controller and action here | Santiago Pastorino | 2010-04-21 | 1 | -1/+0 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | url_for now works with HashWithIndifferentAccess ht jay [#4391 state:committed] | Santiago Pastorino | 2010-04-21 | 2 | -1/+11 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Some require indifferent_access added | Santiago Pastorino | 2010-04-21 | 4 | -1/+5 |
| | | | | Signed-off-by: Xavier Noria <fxn@ubuntu.(none)> | ||||
* | require without .rb | Santiago Pastorino | 2010-04-21 | 1 | -1/+1 |
| | | | | Signed-off-by: Xavier Noria <fxn@ubuntu.(none)> | ||||
* | It should be possible to render :json with options | wycats | 2010-04-20 | 1 | -1/+1 |
| | |||||
* | Remove only formats in shortcuts and do it just once. | José Valim | 2010-04-20 | 1 | -4/+5 |
| | |||||
* | Merge remote branch 'spastorino/master' | Carl Lerche | 2010-04-18 | 3 | -3/+5 |
|\ | |||||
| * | Missing require added | Santiago Pastorino | 2010-04-18 | 1 | -0/+1 |
| | | |||||
| * | perform_caching should be accessed through the controller here | Santiago Pastorino | 2010-04-17 | 1 | -1/+1 |
| | | |||||
| * | perform_caching is now delegated to config on instance and class level | Santiago Pastorino | 2010-04-17 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/rails | Carl Lerche | 2010-04-18 | 9 | -7/+37 |
|\| | |||||
| * | added shorthand support for routes like /projects/status(.:format) | Diego Carrion | 2010-04-17 | 3 | -3/+14 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | access assigns as a method or hash, with strings or symbols [#4431 ↵ | David Chelimsky | 2010-04-17 | 2 | -2/+18 |
| | | | | | | | | state:resolved] | ||||
| * | fisting codes so it will parse [#4430 state:resolved] | Aaron Patterson | 2010-04-17 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
| * | Added missing require | Santiago Pastorino | 2010-04-16 | 1 | -0/+1 |
| | | |||||
| * | Missing requires | wycats | 2010-04-16 | 2 | -0/+2 |
| | | |||||
* | | mail_to with :encode => :javascript now outputs safe html | Sam Elliott | 2010-04-16 | 2 | -3/+7 |
|/ | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
* | Revert "Avoid deprecation warnings and potential TypeErrors [#4404 ↵ | Carl Lerche | 2010-04-16 | 3 | -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 Pilkington | 2010-04-16 | 2 | -1/+5 |
| | | | | | | state:committed] Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | Bump rack-mount dependency to ~> 0.6.3 for CRITICAL FIX | Jeremy Kemper | 2010-04-16 | 1 | -1/+1 |
| | |||||
* | Revert "Require rack-mount 0.6.0 since 0.6.1 and later can't be bundled" | Jeremy Kemper | 2010-04-16 | 1 | -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 deprecate | Santiago Pastorino | 2010-04-16 | 1 | -1/+0 |
| | |||||
* | Added test get to js should have a header with content-type text/javascript | Santiago Pastorino | 2010-04-16 | 1 | -1/+8 |
| | |||||
* | Tidy up a bit this test file | Santiago Pastorino | 2010-04-16 | 1 | -7/+2 |
| | |||||
* | Revert "Add test case which check content type when rendering rjs" partial ↵ | Santiago Pastorino | 2010-04-16 | 1 | -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-16 | 1 | -0/+1 |
| | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | Make perform_caching work again, with the tests passing and backward compatible | Santiago Pastorino and Carl Lerche | 2010-04-15 | 6 | -26/+25 |
| | |||||
* | Revert "logger added to the deprecated config accessor" we need a major ↵ | Santiago Pastorino and Carl Lerche | 2010-04-15 | 1 | -1/+0 |
| | | | | | | refactor to get this working This reverts commit 68f4e046a7f5db3f7c48a3721bead73a625b6f6e. | ||||
* | Avoid deprecation warnings and potential TypeErrors [#4404 state:resolved] | Nicolas Sanguinetti | 2010-04-15 | 2 | -3/+3 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | logger added to the deprecated config accessor | Santiago Pastorino | 2010-04-14 | 1 | -0/+1 |
| | |||||
* | protected instance variables added to the deprecated config accessor | Santiago Pastorino | 2010-04-14 | 1 | -0/+1 |
| | |||||
* | asset and helper path added to the deprecated config accessor | Santiago Pastorino | 2010-04-14 | 1 | -0/+2 |
| | |||||
* | page_cache added to the deprecated config accessor | Santiago Pastorino | 2010-04-14 | 1 | -3/+6 |
| | |||||
* | Make use of config.perform_caching | Santiago Pastorino | 2010-04-14 | 3 | -7/+7 |
| | |||||
* | action_dispatch/routing/deprecated_mapper needs with_options | Matthew Rudy Jacobs | 2010-04-14 | 1 | -0/+1 |
| | | | | | | [#4398 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fix missing dependency on Hash#to_query | Santiago Pastorino | 2010-04-14 | 1 | -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 bundled | Jeremy Kemper | 2010-04-14 | 1 | -1/+1 |
| | |||||
* | Merge commit 'docrails/master' | Xavier Noria | 2010-04-14 | 1 | -1/+1 |
|\ | |||||
| * | Replace 'RAILS_ROOT' to 'Rails.root' and 'RAILS_ENV' to 'Rails.env' in ↵ | Anil Wadghule | 2010-04-12 | 1 | -1/+1 |
| | | | | | | | | significant places. | ||||
* | | Changed translate helper so that it doesn’t mark every translation as safe ↵ | Craig Davey | 2010-04-13 | 4 | -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 Pastorino | 2010-04-13 | 1 | -1/+2 |
| | | | | | | | | | | | | state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Merge branch 'master' of github.com:rails/rails | wycats | 2010-04-13 | 2 | -2/+2 |
|\ \ | |||||
| * | | Use correct RUBY_PLATFORM regex for Windows env [#4385 state:resolved] | Anil Wadghule | 2010-04-13 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | Update changelogs for release | David Heinemeier Hansson | 2010-04-13 | 1 | -1/+1 |
| | | |