aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-0310-32/+132
|\
| * Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0Santiago Pastorino2011-04-021-2/+0
| |
| * Improve docs.José Valim2011-03-311-0/+31
| |
| * pass respond_with options to controller render when using a template for api ↵Josh Kalderimis2011-03-315-5/+25
| | | | | | | | | | | | navigation Signed-off-by: José Valim <jose.valim@gmail.com>
| * only try to display an api template in responders if the request is a get or ↵Josh Kalderimis2011-03-313-4/+31
| | | | | | | | | | | | there are no errors Signed-off-by: José Valim <jose.valim@gmail.com>
| * when using respond_with with an invalid resource and custom options, the ↵Josh Kalderimis2011-03-312-1/+19
| | | | | | | | | | | | default response status and error messages should be returned Signed-off-by: José Valim <jose.valim@gmail.com>
| * use assert_equal so we get normal error messages along with our custom ↵Aaron Patterson2011-03-301-3/+3
| | | | | | | | failure message
| * Make action_method? public and change implicit rendering to override it instead.José Valim2011-03-303-19/+25
| |
* | Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-03-309-28/+127
|\|
| * Pass the proper method_name instead of hardcoding to action_name.José Valim2011-03-292-9/+11
| | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/implicit_render.rb
| * Dont call authenticate_or_request_with_http_basic twiceDavid Heinemeier Hansson2011-03-291-4/+2
| |
| * Remove 'warning: ambiguous first argument' when running ActionPack testsSebastian Martinez2011-03-292-4/+4
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Move mapper_test to the appropriate locationPrem Sichanugrist2011-03-291-0/+0
| | | | | | | | | | | | It seems like in 89c5b9aee7d7db95cec9e5a934c3761872ab107e Aaron actually put the test in action_dispatch folder. However, there's already a `test/dispatch` directory which I think it's more appropriate. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| * Update the wildcard route to be non-greedy by default, therefore be able to ↵Prem Sichanugrist2011-03-294-3/+47
| | | | | | | | | | | | | | | | match the (.:format) segment [#6605 state:resolved] After some discussion with Andrew White, it seems like this is a better approach for handling a wildcard route. However, user can still bring back the old behavior by supplying `:format => false` to the route. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| * Fix examplesDavid Heinemeier Hansson2011-03-282-2/+2
| |
| * Added Base.http_basic_authenticate_with to do simple http basic ↵David Heinemeier Hansson2011-03-283-14/+69
| | | | | | | | authentication with a single class method call [DHH]
* | Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-03-2813-14/+191
|\|
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-271-7/+6
| |\
| | * Proc objects for cache_path for caches_action no longer need controller ↵Ryan Bigg2011-03-261-7/+6
| | | | | | | | | | | | object, nor to use send when calling routing helpers
| * | Add controller-specific `force_ssl` method to force web browser to use HTTPS ↵Prem Sichanugrist2011-03-285-0/+122
| | | | | | | | | | | | | | | | | | | | | | | | protocol This would become useful for site which sometime transferring sensitive information such as account information on particular controller or action. This featured was requested by DHH.
| * | fixes a couple of regexps, the suite showed warnings about themXavier Noria2011-03-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of things worth mentioning here: - "{" is a metacharacter, should be escaped if it is meant to match a "{". The code worked, though, because the regexp engine is tolerant to this, but issued warnings. - gsub accepts a string as first argument. That's the best idiom to use when your pattern has no metacharacters, since gsub interprets the string as an exact substring to look for, rather than a regexp. The benefit is that your pattern is crystal clear and needs no backslashes.
| * | Fix alias_method, add testDavid Heinemeier Hansson2011-03-272-1/+2
| | |
| * | Allow FormHelper#form_for to specify the :method as a direct option instead ↵David Heinemeier Hansson2011-03-263-4/+36
| | | | | | | | | | | | of through the :html hash [DHH]
| * | Make JavaScriptHelper#j() an alias for JavaScriptHelper#escape_javascript() ↵David Heinemeier Hansson2011-03-262-0/+7
| |/ | | | | | | -- note this then supersedes the Object#j() method that the JSON gem adds within templates using the JavaScriptHelper [DHH]
| * correction to the outputted controller name in the diagnostics error ↵Josh Kalderimis2011-03-242-1/+17
| | | | | | | | | | | | template, test included Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | remove deprecated documentationGonçalo Silva2011-03-281-3/+0
| |
* | move "check for ruby-prof" from AD/testing/performance_test to ↵Gonçalo Silva2011-03-241-13/+9
|/ | | | AS/testing/performance, where it is actually required
* Fix filter :only and :except with implicit actionsAndrew White2011-03-232-12/+17
| | | | | | | The method_name argument is "default_render" for implicit actions so use the action_name attribute to determine which callbacks to run. [#5673 state:resolved]
* Add a failing test case for an implicit action with a before filter.Manfred Stienstra2011-03-233-0/+24
| | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-231-0/+7
|\
| * doc :anchor option for #match in routesGabriel Horner2011-03-151-0/+7
| |
* | Do not show optional (.:format) block for wildcard route [#6605 state:resolved]Prem Sichanugrist2011-03-222-1/+8
| | | | | | | | This will make the output of `rake routes` to be correctly match to the behavior of the application, as the regular expression used to match the path is greedy and won't capture the format part by default
* | SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this testAaron Patterson2011-03-211-2/+2
| |
* | Improved resolver docs a bitJosé Valim2011-03-191-2/+10
| |
* | [action_view] docs for FileSystemResolverChris Kowalik2011-03-201-2/+30
| |
* | [action_view] added custom patterns to template resolverChris Kowalik2011-03-206-24/+89
| |
* | fixes an issue with number_to_human when converting values which are less ↵Josh Kalderimis2011-03-162-2/+4
| | | | | | | | | | | | than 1 but greater than -1 [#6576 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | use a list to represent the supported verbs for a route objectAaron Patterson2011-03-142-11/+13
| |
* | stop splatting arguments so that we can understand wtf is going onAaron Patterson2011-03-141-2/+3
| |
* | RegexpWithNamedGroups is only used for path_info, so only apply to path infoAaron Patterson2011-03-141-1/+2
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-141-4/+4
|\
| * Change ActionView::ViewPathSet to ActionView::PathSetManuel Meurer2011-03-131-4/+4
| |
* | Add additional text to NotImplementedErrors [#6328 state:resolved]Mike Gehard2011-03-121-1/+1
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Just define methods directly on the class rather than use the moduleAaron Patterson2011-03-111-14/+5
| | | | | | | | | | | | indirection. clever--
* | do not automatically add format to routes that end in a slashAaron Patterson2011-03-112-1/+52
| |
* | Filter sensitive query string parameters in the log [#6244 state:committed]Prem Sichanugrist & Xavier Noria2011-03-113-4/+57
| | | | | | | | | | | | This provides more safety to applications that put secret information in the query string, such as API keys or SSO tokens. Signed-off-by: Xavier Noria <fxn@hashref.com>
* | Filter params that return nil for to_param and allow through false valuesAndrew White2011-03-094-2/+13
| |
* | stop being clever and just call methods on the Route objectAaron Patterson2011-03-082-1/+4
| |
* | test/unit in ruby trunk adds a new instance variable. YAY!Aaron Patterson2011-03-081-0/+1
|/
* more "SSL everywhere" for GitHub URLsAkira Matsuda2011-03-071-1/+1
| | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 16:40:36 +0000