| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-04-03 | 5 | -30/+68 |
| |\ | |||||
| | * | Improve docs. | José Valim | 2011-03-31 | 1 | -0/+31 |
| | | | |||||
| | * | pass respond_with options to controller render when using a template for api ↵ | Josh Kalderimis | 2011-03-31 | 3 | -5/+5 |
| | | | | | | | | | | | | | 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 Kalderimis | 2011-03-31 | 1 | -4/+9 |
| | | | | | | | | | | | | | 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 Kalderimis | 2011-03-31 | 1 | -1/+2 |
| | | | | | | | | | | | | | 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 Patterson | 2011-03-30 | 1 | -3/+3 |
| | | | | | | | | | failure message | ||||
| | * | Make action_method? public and change implicit rendering to override it instead. | José Valim | 2011-03-30 | 2 | -19/+20 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-03-30 | 4 | -24/+32 |
| |\| | |||||
| | * | Pass the proper method_name instead of hardcoding to action_name. | José Valim | 2011-03-29 | 2 | -9/+11 |
| | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/implicit_render.rb | ||||
| | * | Dont call authenticate_or_request_with_http_basic twice | David Heinemeier Hansson | 2011-03-29 | 1 | -4/+2 |
| | | | |||||
| | * | Update the wildcard route to be non-greedy by default, therefore be able to ↵ | Prem Sichanugrist | 2011-03-29 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | 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 examples | David Heinemeier Hansson | 2011-03-28 | 1 | -1/+1 |
| | | | |||||
| | * | Added Base.http_basic_authenticate_with to do simple http basic ↵ | David Heinemeier Hansson | 2011-03-28 | 1 | -14/+16 |
| | | | | | | | | | authentication with a single class method call [DHH] | ||||
| * | | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-03-28 | 8 | -12/+64 |
| |\| | |||||
| | * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-27 | 1 | -7/+6 |
| | |\ | |||||
| | | * | Proc objects for cache_path for caches_action no longer need controller ↵ | Ryan Bigg | 2011-03-26 | 1 | -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 Sichanugrist | 2011-03-28 | 3 | -0/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 them | Xavier Noria | 2011-03-27 | 1 | -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 test | David Heinemeier Hansson | 2011-03-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | Allow FormHelper#form_for to specify the :method as a direct option instead ↵ | David Heinemeier Hansson | 2011-03-26 | 1 | -2/+13 |
| | | | | | | | | | | | | | of through the :html hash [DHH] | ||||
| | * | | Make JavaScriptHelper#j() an alias for JavaScriptHelper#escape_javascript() ↵ | David Heinemeier Hansson | 2011-03-26 | 1 | -0/+5 |
| | |/ | | | | | | | -- 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 Kalderimis | 2011-03-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | template, test included Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | remove deprecated documentation | Gonçalo Silva | 2011-03-28 | 1 | -3/+0 |
| | | | |||||
| * | | move "check for ruby-prof" from AD/testing/performance_test to ↵ | Gonçalo Silva | 2011-03-24 | 1 | -13/+9 |
| |/ | | | | AS/testing/performance, where it is actually required | ||||
| * | Fix filter :only and :except with implicit actions | Andrew White | 2011-03-23 | 1 | -1/+1 |
| | | | | | | | | 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] | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-23 | 1 | -0/+7 |
| |\ | |||||
| | * | doc :anchor option for #match in routes | Gabriel Horner | 2011-03-15 | 1 | -0/+7 |
| | | | |||||
| * | | Do not show optional (.:format) block for wildcard route [#6605 state:resolved] | Prem Sichanugrist | 2011-03-22 | 1 | -1/+1 |
| | | | | | | | | | 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 | ||||
| * | | Improved resolver docs a bit | José Valim | 2011-03-19 | 1 | -2/+10 |
| | | | |||||
| * | | [action_view] docs for FileSystemResolver | Chris Kowalik | 2011-03-20 | 1 | -2/+30 |
| | | | |||||
| * | | [action_view] added custom patterns to template resolver | Chris Kowalik | 2011-03-20 | 2 | -24/+55 |
| | | | |||||
| * | | fixes an issue with number_to_human when converting values which are less ↵ | Josh Kalderimis | 2011-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | 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 object | Aaron Patterson | 2011-03-14 | 2 | -11/+13 |
| | | | |||||
| * | | stop splatting arguments so that we can understand wtf is going on | Aaron Patterson | 2011-03-14 | 1 | -2/+3 |
| | | | |||||
| * | | RegexpWithNamedGroups is only used for path_info, so only apply to path info | Aaron Patterson | 2011-03-14 | 1 | -1/+2 |
| |/ | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-14 | 1 | -4/+4 |
| |\ | |||||
| | * | Change ActionView::ViewPathSet to ActionView::PathSet | Manuel Meurer | 2011-03-13 | 1 | -4/+4 |
| | | | |||||
| * | | Add additional text to NotImplementedErrors [#6328 state:resolved] | Mike Gehard | 2011-03-12 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | Just define methods directly on the class rather than use the module | Aaron Patterson | 2011-03-11 | 1 | -14/+5 |
| | | | | | | | | | | | | | indirection. clever-- | ||||
| * | | do not automatically add format to routes that end in a slash | Aaron Patterson | 2011-03-11 | 1 | -1/+1 |
| | | | |||||
| * | | Filter sensitive query string parameters in the log [#6244 state:committed] | Prem Sichanugrist & Xavier Noria | 2011-03-11 | 1 | -4/+17 |
| | | | | | | | | | | | | | 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 values | Andrew White | 2011-03-09 | 2 | -2/+1 |
| | | | |||||
| * | | stop being clever and just call methods on the Route object | Aaron Patterson | 2011-03-08 | 2 | -1/+4 |
| | | | |||||
| * | | test/unit in ruby trunk adds a new instance variable. YAY! | Aaron Patterson | 2011-03-08 | 1 | -0/+1 |
| |/ | |||||
| * | more "SSL everywhere" for GitHub URLs | Akira Matsuda | 2011-03-07 | 1 | -1/+1 |
| | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere | ||||
| * | fix typos | Akira Matsuda | 2011-03-07 | 1 | -2/+2 |
| | | |||||
| * | Improve testing of cookies in functional tests: | Andrew White | 2011-03-06 | 3 | -3/+17 |
| | | | | | | | | | | - cookies can be set using string or symbol keys - cookies are preserved across calls to get, post, etc. - cookie names and values are escaped - cookies can be cleared using @request.cookies.clear [#6272 state:resolved] | ||||
| * | Raise ArgumentError if route name is invalid [#6517 state:resolved] | Andrew White | 2011-03-06 | 1 | -0/+2 |
| | | |||||
| * | Allow model to be inherited from Hash [#6487 state:resolved] | Alexander Uvarov | 2011-03-06 | 1 | -3/+4 |
| | | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | ||||
| * | Action Pack typos. | R.T. Lechow | 2011-03-05 | 9 | -13/+13 |
| | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |