aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8085 from acapilleri/format_never_nilGuillermo Iguaran2012-12-224-3/+28
|\
| * return Mime::NullType if format is unknownAngelo Capilleri2012-12-224-3/+28
* | Merge pull request #8586 from balexand/cache_digests_regexRafael Mendonça França2012-12-213-2/+12
|\ \ | |/ |/|
| * Digestor explicit dependency should not contain trailing whitespaceBrian Alexander2012-12-213-2/+12
* | Move background jobs to the 'jobs' branch until fully baked. Not shipping wit...Jeremy Kemper2012-12-211-10/+0
* | Merge pull request #7312 from krainboltgreene/http-token-parser-bugSteve Klabnik2012-12-212-17/+56
|\ \ | |/ |/|
| * Refactoring the token_and_options method to fix bugsKurtis Rainbolt-Greene2012-12-152-17/+56
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-212-1/+6
|\ \
| * | Revert "Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106"Vijay Dev2012-12-211-1/+1
| * | Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106kei2012-12-201-1/+1
| * | Fix documentation stylekei2012-12-201-1/+1
| * | Add script_name option description and example for #url_for optionsIvan Vanyak2012-12-171-0/+5
| |/
* | Fix indentation issuing warningCarlos Antonio da Silva2012-12-201-1/+1
* | Merge pull request #8567 from frodsan/update_coding_conventions_journeyRafael Mendonça França2012-12-2017-438/+440
|\ \
| * | update AD::Journey to follow Rails coding conventionsFrancesco Rodriguez2012-12-2017-438/+440
* | | Fix CHANGELOG entry about scope changeGuillermo Iguaran2012-12-201-1/+1
|/ /
* | :nodoc: Journey because is not part of the public API [ci skip]Francesco Rodriguez2012-12-1920-78/+75
* | remove code for Ruby 1.8.x supportFrancesco Rodriguez2012-12-191-7/+2
* | Remove the actual extension file as well [ci skip]Andrew White2012-12-191-11/+0
* | Remove obsolete Hash extension needed for Ruby 1.8.x supportAndrew White2012-12-191-1/+0
* | Integrate Journey into Action DispatchAndrew White2012-12-1944-3/+3967
* | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2012-12-191-5/+5
* | Remove obfuscation support from mail_to helperNick Reed2012-12-183-110/+17
* | Minor js review [ci skip]Carlos Antonio da Silva2012-12-181-7/+7
* | handle protocol option in stylesheet_link_tag and javascript_include_tagVasiliy Ermolovich2012-12-183-3/+33
* | Format routes as html on debug pageschneems2012-12-174-2/+76
* | Make conditional_layout? private and update documentationAndrew White2012-12-171-15/+23
* | Merge pull request #8529 from schneems/schneems/debug-exceptions-extend-pathSteve Klabnik2012-12-161-1/+1
|\ \ | |/ |/|
| * DebugExceptions `File.join` => `File.expand_path`schneems2012-12-161-1/+1
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-151-0/+412
|\ \
| * | repeating documentation for form helpersThiago Pinto2012-12-091-18/+406
* | | Convert changelogs to 1.9 hash style and fix some formatting [ci skip]Carlos Antonio da Silva2012-12-141-26/+26
* | | Revert "Merge pull request #8499 from schneems/schneems/html-route-inspector"Steve Klabnik2012-12-141-24/+7
* | | remove a cache we do not needAaron Patterson2012-12-141-5/+1
* | | Merge pull request #8510 from thedarkone/thread_safety_improvementsAaron Patterson2012-12-146-63/+48
|\ \ \
| * | | Replace some global Hash usages with the new thread safe cache.thedarkone2012-12-146-63/+48
* | | | Improve the documentation of cache_if and cache_unlessRafael Mendonça França2012-12-141-4/+7
* | | | Merge pull request #8497 from acapilleri/conditional_cacheRafael Mendonça França2012-12-143-31/+55
|\ \ \ \
| * | | | Removed :if and :unless from fragment cache option in favour ofAngelo capilleri2012-12-143-31/+55
* | | | | Clear url helper methods when routes are reloadedAndrew White2012-12-143-0/+94
* | | | | Revert "Clear url helpers when reloading routes"Andrew White2012-12-142-5/+0
* | | | | Add missing require.Rafael Mendonça França2012-12-133-0/+4
* | | | | Merge pull request #8499 from schneems/schneems/html-route-inspectorSteve Klabnik2012-12-131-7/+24
|\ \ \ \ \
| * | | | | Output routes in :html formatschneems2012-12-121-7/+24
| |/ / / /
* | | | | Bring back helpers_path attr accessorCarlos Antonio da Silva2012-12-131-1/+1
* | | | | Refactor helpers code in Action Pack a bitCarlos Antonio da Silva2012-12-133-8/+6
|/ / / /
* | | | Remove deprecation message from Action PackCarlos Antonio da Silva2012-12-111-1/+1
* | | | Remove not used variable warnings from AM and ACCarlos Antonio da Silva2012-12-111-1/+1
* | | | Fix rewinding in ActionDispatch::Request#raw_postMatt Venables2012-12-113-2/+15
* | | | Match the controller and path names defensively.Hiro Asari2012-12-101-1/+1