aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Speed up I18n helpers in views and add entry to CHANGELOG.José Valim2010-05-011-7/+3
|
* Use %{} syntax in I18n (faster) instead of {{}}.José Valim2010-05-012-17/+17
|
* RouteSet does not raise ActionController::RoutingError when no routes match ↵Carl Lerche2010-04-304-18/+35
| | | | anymore. Instead, it follows the X-Cascade convention. ShowExceptions checks for X-Cascade so that the routing error page can still be displayed.
* Merge remote branch 'technoweenie/http_token_authentication'Jeremy Kemper2010-04-304-0/+274
|\ | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * add HTTP Token Authorization support to complement Basic and Digest ↵rick2010-04-303-0/+272
| | | | | | | | Authorization.
* | Merge branch 'master' of github.com:rails/railswycats2010-04-307-69/+152
|\|
| * removing the extra assignment statement [#4432 state:resolved]Neeraj Singh2010-04-301-1/+0
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Fix form builder and form helpers inconsistencies [#4432 state:resolved]Neeraj Singh2010-04-293-64/+115
| | | | | | | | | | | | | | | | * datetime_select and select_datetime should be consistent as much as possible * date_select and select_date should be consistent as much as possible * time_select and select_time should be consistent as much as possible Signed-off-by: José Valim <jose.valim@gmail.com>
| * ActionCachingTestController rescues from all exceptions. Making sure that ↵Neeraj Singh2010-04-292-1/+32
| | | | | | | | | | | | all the tests check for valid response. [#4468 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Move several configuration values from Hash to ActiveSupport::XmlMini, which ↵José Valim2010-04-291-0/+2
| | | | | | | | | | | | both Hash and Array depends on. Also, refactored ActiveModel serializers to just use ActiveSupport::XmlMini.to_tag. As consequence, if a serialized attribute is an array or a hash, it's not encoded as yaml, but as a hash or array.
| * Fix prototype grep depending on JSON encoding regexp as JavaScript regexpJeremy Kemper2010-04-271-1/+1
| |
| * Only run load hooks once a file has been fully loaded.Nathan Weizenbaum2010-04-271-2/+2
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Merge branch 'master' of github.com:rails/railswycats2010-04-2631-356/+315
|\|
| * Use Config::CONFIG['host_os'] instead of RUBY_PLATFORM [#4477 state:resolved]Anil Wadghule2010-04-261-1/+2
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * extract ActionController::TestCase::BehaviorDavid Chelimsky2010-04-261-126/+133
| | | | | | | | | | | | | | | | | | | | - this makes it possible for other test frameworks to hook into testing facilities provided by Rails without having to subclass AC::TestCase. [#4474 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Action Pack: fix tests with -K*, work around Ruby 1.9.1 constant lookup.Cezary Baginski2010-04-252-4/+4
| | | | | | | | | | | | [#4473 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * allow unsubscribe by name or subscription [#4433 state:resolved]David Chelimsky2010-04-241-0/+1
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Missed commit: explicit source encodingJeremy Kemper2010-04-241-1/+1
| |
| * Explicit source encodingJeremy Kemper2010-04-241-0/+1
| |
| * Add a test for assert_recognizes on ActionDispatch::IntegrationTest [#4390 ↵Santiago Pastorino2010-04-242-1/+13
| | | | | | | | | | | | state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Rename fieldWithErrors style to field_with_errors. Remove unused alert style.Jeremy Kemper2010-04-243-5/+7
| |
| * Fix render :xml test (ht Simo Niemelä)José Valim2010-04-241-2/+2
| |
| * HWIA symbolize_keys now returns a hash so no need to do this anymoreSantiago Pastorino2010-04-221-1/+1
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Make ActionDispatch url_for use HWIA symbolize_keysSantiago Pastorino2010-04-222-4/+8
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Ensure that url_for uses symbolized keys in the controller. [#4391]J Smith2010-04-222-1/+11
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Always downstream given options in :json, :xml and :js renderers and add ↵José Valim2010-04-223-9/+37
| | | | | | | | tests for it.
| * 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.
* | Allow :remote => false to be passed to link_toNicolas Sanguinetti2010-04-223-3/+21
|/ | | | | | | And add tests for `button_to` and `form_tag` which currently behave as expected, so we avoid a regression. Signed-off-by: wycats <wycats@gmail.com>
* 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
|