aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge pull request #8450 from senny/8448_mailer_return_valuesRafael Mendonça França2012-12-104-2/+16
|\ \ \
| * | | The return value from mailer methods is not relevant.Yves Senn2012-12-104-2/+16
* | | | Merge pull request #8441 from itzki/fix_decorate_columnsCarlos Antonio da Silva2012-12-103-4/+20
|\ \ \ \
| * | | | Fix decorating columns for serialized attributesitzki2012-12-103-4/+20
|/ / / /
* | | | Merge branch 'scaffold_fixes'Rafael Mendonça França2012-12-1010-22/+84
|\ \ \ \
| * | | | Ensure the scaffold tests will pass when using references attributesRafael Mendonça França2012-12-101-0/+10
| * | | | Add GeneratedAttribute#column_name to get the name of the column in theRafael Mendonça França2012-12-104-8/+19
| * | | | Extract a attributes_names method to avoid duplicationRafael Mendonça França2012-12-104-22/+12
| * | | | Deal with polymorphic attributes correctly in the generatorsRafael Mendonça França2012-12-106-10/+41
| * | | | Make references and belongs_to attributes to generate the _id column inRafael Mendonça França2012-12-102-2/+7
| * | | | Put the reference and belongs_to attributes in the scaffold tests.Rafael Mendonça França2012-12-103-12/+9
| * | | | Use the references and belongs_id ids in the scaffold_controllerRafael Mendonça França2012-12-092-1/+10