aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Unify sprockets config optionsJoshua Peek2011-03-301-1/+1
* Merge branch 'master' into sprocketsJoshua Peek2011-03-3024-62/+344
|\
| * 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-303-19/+25
| * 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
| * Remove 'warning: ambiguous first argument' when running ActionPack testsSebastian Martinez2011-03-292-4/+4
| * Move mapper_test to the appropriate locationPrem Sichanugrist2011-03-291-0/+0
| * Update the wildcard route to be non-greedy by default, therefore be able to m...Prem Sichanugrist2011-03-294-3/+47
| * Fix examplesDavid Heinemeier Hansson2011-03-282-2/+2
| * Added Base.http_basic_authenticate_with to do simple http basic authenticatio...David Heinemeier Hansson2011-03-283-14/+69
| * 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-285-0/+122
| * | fixes a couple of regexps, the suite showed warnings about themXavier Noria2011-03-271-2/+2
| * | Fix alias_method, add testDavid Heinemeier Hansson2011-03-272-1/+2
| * | Allow FormHelper#form_for to specify the :method as a direct option instead o...David Heinemeier Hansson2011-03-263-4/+36
| * | Make JavaScriptHelper#j() an alias for JavaScriptHelper#escape_javascript() -...David Heinemeier Hansson2011-03-262-0/+7
| |/
| * correction to the outputted controller name in the diagnostics error template...Josh Kalderimis2011-03-242-1/+17
* | Merge branch 'master' into sprocketsJoshua Peek2011-03-306-2/+45
|\|
| * Fix filter :only and :except with implicit actionsAndrew White2011-03-232-12/+17
| * Add a failing test case for an implicit action with a before filter.Manfred Stienstra2011-03-233-0/+24
| * 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
* | | Seperate asset directoriesJoshua Peek2011-03-298-16/+21
* | | Rename option to config.asset_pipelineJoshua Peek2011-03-291-1/+1
* | | Change back to /assets prefixJoshua Peek2011-03-291-2/+2
* | | Only add fingerprints if perform_caching is onJoshua Peek2011-03-291-1/+1
* | | Copy use_sprockets configJoshua Peek2011-03-292-2/+3
* | | Use sprockets helpers if config.use_sprockets is setJoshua Peek2011-03-292-6/+22
* | | Tests for SprocketsHelperJoshua Peek2011-03-298-5/+104
* | | Update sprockets path generation methodJoshua Peek2011-03-281-1/+1
* | | Add SprocketsHelperJoshua Peek2011-03-282-0/+79
* | | Remove sprockets exception from main asset helpersJoshua Peek2011-03-282-20/+0
* | | Add sprockets md5s to asset tagsJoshua Peek2011-03-222-0/+20
|/ /
* | 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 tha...Josh Kalderimis2011-03-162-2/+4
* | 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-112-1/+52
* | Filter sensitive query string parameters in the log [#6244 state:committed]Prem Sichanugrist & Xavier Noria2011-03-113-4/+57