aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-144-0/+165
* | Revert "Clear url helpers when reloading routes"Andrew White2012-12-142-5/+0
* | Fix failing test in railtiesCarlos Antonio da Silva2012-12-141-2/+1
* | Add missing require.Rafael Mendonça França2012-12-133-0/+4
* | Merge pull request #8432 from rmcastil/add_migration_example_to_each_associat...Rafael Mendonça França2012-12-131-0/+130
|\ \
| * | Add migration example to Association Basics [ci skip]Ryan Castillo2012-12-131-0/+130
* | | Merge pull request #8499 from schneems/schneems/html-route-inspectorSteve Klabnik2012-12-133-9/+51
|\ \ \
| * | | Output routes in :html formatschneems2012-12-123-9/+51
| | |/ | |/|
* | | Bring back helpers_path attr accessorCarlos Antonio da Silva2012-12-131-1/+1
* | | Merge pull request #8503 from siong1987/debugger-jrubyCarlos Antonio da Silva2012-12-131-0/+2
|\ \ \
| * | | don't include debugger gem if jruby is used since it doesn't work on jruby.Teng Siong Ong2012-12-121-0/+2
* | | | Refactor helpers code in Action Pack a bitCarlos Antonio da Silva2012-12-133-8/+6
* | | | Merge pull request #8500 from senny/8492_migrations_crash_on_specific_pathCarlos Antonio da Silva2012-12-134-1/+23
|\ \ \ \
| * | | | recognize migrations, in folders containing numbers and 'rb'.Yves Senn2012-12-134-1/+23
| | |/ / | |/| |
* | | | Merge pull request #8502 from arunagw/masterJeremy Kemper2012-12-121-1/+1
|\ \ \ \
| * | | | Fixed test names for generated_attribute_test.rbArun Agrawal2012-12-131-1/+1
|/ / / /
* | | | Merge pull request #8496 from ptn/link-AR-basics-guideSteve Klabnik2012-12-122-42/+186
|\ \ \ \ | |_|/ / |/| | |
| * | | General refreshment of the Active Record Basics guidePablo Torres2012-12-122-42/+186
| |/ /
* / / Shush deprecation warning due to initializing a Migrator with migration paths...Jeremy Kemper2012-12-121-1/+1
|/ /
* | 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-112-3/+2
* | Merge pull request #8490 from mattv/fix_request_raw_postRafael Mendonça França2012-12-113-2/+15
|\ \
| * | Fix rewinding in ActionDispatch::Request#raw_postMatt Venables2012-12-113-2/+15
* | | Improve test name related to cache timestamp format [ci skip]Carlos Antonio da Silva2012-12-111-1/+1
* | | Backport thread-local variables from Ruby 2.0Rafael Mendonça França2012-12-112-0/+147
|/ /
* | Deprecate obsolete Time to DateTime fallback methodsAndrew White2012-12-1113-38/+67
* | Beef up tests for String#in_time_zone and Date#in_time_zoneAndrew White2012-12-112-18/+128
* | Only call `in_time_zone` on Time or DateTime instancesAndrew White2012-12-111-1/+6
* | Clean up 'active_support/time' requiresAndrew White2012-12-111-15/+6
* | Remove changelog entry from #8441 [ci skip]Carlos Antonio da Silva2012-12-111-4/+0
* | Merge pull request #8484 from gclag/dynamic-index-refinementsXavier Noria2012-12-111-0/+2
|\ \
| * | Explain how to supersede the new dynamic welcome pageGeorge Claghorn2012-12-111-0/+2
* | | Deprecate Date#to_time_in_current_zoneAndrew White2012-12-115-5/+37
* | | Add missing at_end_of_* aliasesAndrew White2012-12-113-0/+5
* | | Add String#in_time_zone methodAndrew White2012-12-114-24/+60
|/ /
* | Merge pull request #8482 from BanzaiMan/defensive_matching_on_default_index_pageSantiago Pastorino2012-12-101-1/+1
|\ \
| * | Match the controller and path names defensively.Hiro Asari2012-12-101-1/+1
|/ /
* | Merge pull request #8468 from schneems/schneems/rack-index-pageSantiago Pastorino2012-12-1012-28/+55
|\ \
| * | Use Rails to Render Default Index Pageschneems2012-12-1012-28/+55
* | | Make sure that no extra spaces are created with a non-polymorphicRafael Mendonça França2012-12-102-4/+8
* | | Add CHANGELOG entry for #6376.Rafael Mendonça França2012-12-101-0/+4
* | | Allow users to choose the timestamp format in the cache keyRafael Mendonça França2012-12-105-1/+31
* | | Make sure the tests pass in the case closer to described in #8195Rafael Mendonça França2012-12-104-19/+14
* | | Added regression test for #8195.jacobstr2012-12-101-0/+18
* | | Move new CHANGELOG entry to the topRafael Mendonça França2012-12-101-9/+9
* | | Merge pull request #8476 from sheerun/fix/multipart-getRafael Mendonça França2012-12-103-1/+19
|\ \ \
| * | | Prevent raising EOFError on multipart GET request.Adam Stankiewicz2012-12-103-1/+19