Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | RouteSet does not raise ActionController::RoutingError when no routes match ↵ | Carl Lerche | 2010-04-30 | 2 | -12/+24 |
| | | | | 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 Kemper | 2010-04-30 | 1 | -0/+113 |
|\ | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | add HTTP Token Authorization support to complement Basic and Digest ↵ | rick | 2010-04-30 | 1 | -0/+113 |
| | | | | | | | | Authorization. | ||||
* | | Merge branch 'master' of github.com:rails/rails | wycats | 2010-04-30 | 2 | -21/+111 |
|\| | |||||
| * | Fix form builder and form helpers inconsistencies [#4432 state:resolved] | Neeraj Singh | 2010-04-29 | 1 | -21/+80 |
| | | | | | | | | | | | | | | | | * 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 Singh | 2010-04-29 | 1 | -0/+31 |
| | | | | | | | | | | | | all the tests check for valid response. [#4468 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Merge branch 'master' of github.com:rails/rails | wycats | 2010-04-26 | 11 | -22/+75 |
|\| | |||||
| * | Use Config::CONFIG['host_os'] instead of RUBY_PLATFORM [#4477 state:resolved] | Anil Wadghule | 2010-04-26 | 1 | -1/+2 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Action Pack: fix tests with -K*, work around Ruby 1.9.1 constant lookup. | Cezary Baginski | 2010-04-25 | 2 | -4/+4 |
| | | | | | | | | | | | | [#4473 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Missed commit: explicit source encoding | Jeremy Kemper | 2010-04-24 | 1 | -1/+1 |
| | | |||||
| * | Explicit source encoding | Jeremy Kemper | 2010-04-24 | 1 | -0/+1 |
| | | |||||
| * | Add a test for assert_recognizes on ActionDispatch::IntegrationTest [#4390 ↵ | Santiago Pastorino | 2010-04-24 | 2 | -1/+13 |
| | | | | | | | | | | | | state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Rename fieldWithErrors style to field_with_errors. Remove unused alert style. | Jeremy Kemper | 2010-04-24 | 1 | -4/+4 |
| | | |||||
| * | Fix render :xml test (ht Simo Niemelä) | José Valim | 2010-04-24 | 1 | -2/+2 |
| | | |||||
| * | Make ActionDispatch url_for use HWIA symbolize_keys | Santiago Pastorino | 2010-04-22 | 1 | -3/+7 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Ensure that url_for uses symbolized keys in the controller. [#4391] | J Smith | 2010-04-22 | 1 | -0/+10 |
| | | | | | | | | 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 | 2 | -7/+35 |
| | | | | | | | | tests for it. | ||||
| * | Clean up the config object in ActionPack. Create config_accessor which just ↵ | José Valim | 2010-04-22 | 1 | -3/+0 |
| | | | | | | | | delegates to the config object, reducing the number of deprecations and add specific tests. | ||||
* | | Allow :remote => false to be passed to link_to | Nicolas Sanguinetti | 2010-04-22 | 2 | -0/+20 |
|/ | | | | | | | 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 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 | 1 | -0/+10 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Merge branch 'master' of github.com:rails/rails | Carl Lerche | 2010-04-18 | 4 | -2/+28 |
|\ | |||||
| * | added shorthand support for routes like /projects/status(.:format) | Diego Carrion | 2010-04-17 | 1 | -0/+9 |
| | | | | | | | | 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 | 1 | -0/+16 |
| | | | | | | | | 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 |
| | | |||||
* | | mail_to with :encode => :javascript now outputs safe html | Sam Elliott | 2010-04-16 | 1 | -2/+6 |
|/ | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
* | Mark the result of grouped_options_for_select as HTML safe [#4322 ↵ | Kieran Pilkington | 2010-04-16 | 1 | -0/+4 |
| | | | | | | state:committed] Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | 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. | ||||
* | Make perform_caching work again, with the tests passing and backward compatible | Santiago Pastorino and Carl Lerche | 2010-04-15 | 2 | -14/+14 |
| | |||||
* | Changed translate helper so that it doesn’t mark every translation as safe ↵ | Craig Davey | 2010-04-13 | 2 | -2/+17 |
| | | | | | | 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> | ||||
* | Merge branch 'master' of github.com:rails/rails | wycats | 2010-04-13 | 1 | -1/+1 |
|\ | |||||
| * | 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> | ||||
* | | Add test case which check content type when rendering rjs partial in html ↵ | Stanko Alexander | 2010-04-13 | 1 | -1/+9 |
|/ | | | | | | template Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Add a test that used to fail but is fixed now [#3417 state:resolved] | wycats | 2010-04-12 | 1 | -0/+1 |
| | |||||
* | Fix a bug in url generation for generic routes. | José Valim | 2010-04-12 | 1 | -0/+12 |
| | |||||
* | Ensure match path, :controller => name works as expected. | José Valim | 2010-04-12 | 1 | -0/+9 |
| | |||||
* | fields_for returns block result when outside ERB | Ryan Bates | 2010-04-11 | 1 | -0/+5 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Make namespace work with options[:to] [#4351 state:committed] | Santiago Pastorino | 2010-04-11 | 1 | -2/+2 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Move verification to a plugin as well: http://github.com/rails/verification.git | José Valim | 2010-04-10 | 1 | -270/+0 |
| | |||||
* | Remove input, form, error_messages_for and error_message_on from the ↵ | José Valim | 2010-04-10 | 3 | -363/+12 |
| | | | | framework. If you think you will miss them, feel free to use the dynamic_form plugin available at http://github.com/rails/dynamic_form | ||||
* | Dial back from 'namespace :controller => ...' to 'scope :module => ...' | Jeremy Kemper | 2010-04-09 | 1 | -4/+4 |
| | |||||
* | Add test showing root match in path namespace | Jeremy Kemper | 2010-04-09 | 1 | -0/+4 |
| | |||||
* | Routes can be selectively namespaced by path or controller module | Jeremy Kemper | 2010-04-09 | 1 | -0/+24 |
| | |||||
* | fix stack trace lines on class_eval | Santiago Pastorino | 2010-04-09 | 1 | -2/+2 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Expect an incompatible encoding exception when a template with a magic ↵ | Jeremy Kemper | 2010-04-08 | 6 | -4/+23 |
| | | | | comment renders a partial without one and its source encoding doesn't match the default external encoding | ||||
* | Expect an incompatible encoding exception when a template doesn't have a ↵ | Jeremy Kemper | 2010-04-08 | 3 | -27/+38 |
| | | | | magic comment and its source encoding doesn't match the default external encoding | ||||
* | adds #favicon_link_tag back, rdoc explains why it is useful, and how to get ↵ | Xavier Noria | 2010-04-08 | 1 | -0/+12 |
| | | | | a link for Mobile Safari with it |