aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-035-30/+68
|\
| * Improve docs.José Valim2011-03-311-0/+31
| * pass respond_with options to controller render when using a template for api ...Josh Kalderimis2011-03-313-5/+5
| * only try to display an api template in responders if the request is a get or ...Josh Kalderimis2011-03-311-4/+9
| * when using respond_with with an invalid resource and custom options, the defa...Josh Kalderimis2011-03-311-1/+2
| * use assert_equal so we get normal error messages along with our custom failur...Aaron Patterson2011-03-301-3/+3
| * Make action_method? public and change implicit rendering to override it instead.José Valim2011-03-302-19/+20
* | Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-03-304-24/+32
|\|
| * Pass the proper method_name instead of hardcoding to action_name.José Valim2011-03-292-9/+11
| * Dont call authenticate_or_request_with_http_basic twiceDavid Heinemeier Hansson2011-03-291-4/+2
| * Update the wildcard route to be non-greedy by default, therefore be able to m...Prem Sichanugrist2011-03-291-1/+7
| * Fix examplesDavid Heinemeier Hansson2011-03-281-1/+1
| * Added Base.http_basic_authenticate_with to do simple http basic authenticatio...David Heinemeier Hansson2011-03-281-14/+16
* | Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-03-288-12/+64
|\|
| * 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 objec...Ryan Bigg2011-03-261-7/+6
| * | Add controller-specific `force_ssl` method to force web browser to use HTTPS ...Prem Sichanugrist2011-03-283-0/+37
| * | fixes a couple of regexps, the suite showed warnings about themXavier Noria2011-03-271-2/+2
| * | Fix alias_method, add testDavid Heinemeier Hansson2011-03-271-1/+1
| * | Allow FormHelper#form_for to specify the :method as a direct option instead o...David Heinemeier Hansson2011-03-261-2/+13
| * | Make JavaScriptHelper#j() an alias for JavaScriptHelper#escape_javascript() -...David Heinemeier Hansson2011-03-261-0/+5
| |/
| * correction to the outputted controller name in the diagnostics error template...Josh Kalderimis2011-03-241-1/+1
* | remove deprecated documentationGonçalo Silva2011-03-281-3/+0
* | move "check for ruby-prof" from AD/testing/performance_test to AS/testing/per...Gonçalo Silva2011-03-241-13/+9
|/
* Fix filter :only and :except with implicit actionsAndrew White2011-03-231-1/+1
* 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-221-1/+1
* | 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-202-24/+55
* | fixes an issue with number_to_human when converting values which are less tha...Josh Kalderimis2011-03-161-1/+1
* | 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
* | Just define methods directly on the class rather than use the moduleAaron Patterson2011-03-111-14/+5
* | do not automatically add format to routes that end in a slashAaron Patterson2011-03-111-1/+1
* | Filter sensitive query string parameters in the log [#6244 state:committed]Prem Sichanugrist & Xavier Noria2011-03-111-4/+17
* | Filter params that return nil for to_param and allow through false valuesAndrew White2011-03-092-2/+1
* | 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
* fix typosAkira Matsuda2011-03-071-2/+2
* Improve testing of cookies in functional tests:Andrew White2011-03-063-3/+17
* Raise ArgumentError if route name is invalid [#6517 state:resolved]Andrew White2011-03-061-0/+2
* Allow model to be inherited from Hash [#6487 state:resolved]Alexander Uvarov2011-03-061-3/+4
* Action Pack typos.R.T. Lechow2011-03-059-13/+13