aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Simple replacement of variable name for consistencyMarc-Andre Lafortune2012-12-211-32/+32
* Integrate Journey into Action DispatchAndrew White2012-12-191-2/+0
* Revert "Add test to deprecation of Path#children"Carlos Antonio da Silva2012-12-191-6/+0
* update concerned testsFrancesco Rodriguez2012-12-181-0/+2
* fix railties CHANGELOG [ci skip]Francesco Rodriguez2012-12-181-2/+3
* Revert "Merge pull request #7587 from elia/fix-too-eager-loading"Rafael Mendonça França2012-12-183-17/+6
* Fix changelogDavid Heinemeier Hansson2012-12-181-3/+1
* MergeDavid Heinemeier Hansson2012-12-184-4/+13
|\
| * Format routes as html on debug pageschneems2012-12-172-74/+5
| * HTML formatting to Rails::InfoController#routesschneems2012-12-174-4/+80
* | Add app/models/concerns and app/controllers/concerns to the default directory...David Heinemeier Hansson2012-12-183-0/+17
|/
* Remove blank lines from generated GemfileSam Ruby2012-12-151-2/+2
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-152-9/+2
|\
| * copy editing [ci skip]Vijay Dev2012-12-151-1/+1
| * Revert "Add quotes to Numeric Passwords to force string(sqlserver)"Vijay Dev2012-12-151-2/+0
| * Revert "Add quotes to Numeric Passwords to force string(jdbcmysql)"Vijay Dev2012-12-151-2/+0
| * Revert "Add quotes to Numeric Passwords to force string(jdbcpostgresql)"Vijay Dev2012-12-151-2/+0
| * Revert "Add quotes to Numeric Passwords to force string(MySql)"Vijay Dev2012-12-151-2/+0
| * Revert "Add quotes to Numeric Passwords to force string(Postgres)"Vijay Dev2012-12-151-2/+0
| * Change method is default since rails 3.1 [ci skip]Gaurish Sharma2012-12-141-8/+1
| * Update railties/lib/rails/info_controller.rbRichard Schneeman2012-12-101-1/+1
| * Add quotes to Numeric Passwords to force string(sqlserver)Gaurish Sharma2012-12-101-0/+2
| * Add quotes to Numeric Passwords to force string(jdbcmysql)Gaurish Sharma2012-12-101-0/+2
| * Add quotes to Numeric Passwords to force string(jdbcpostgresql)Gaurish Sharma2012-12-101-0/+2
| * Add quotes to Numeric Passwords to force string(MySql)Gaurish Sharma2012-12-101-0/+2
| * Add quotes to Numeric Passwords to force string(Postgres)Gaurish Sharma2012-12-101-0/+2
* | Convert changelogs to 1.9 hash style and fix some formatting [ci skip]Carlos Antonio da Silva2012-12-141-7/+8
* | Revert "Fix failing test in railties"Steve Klabnik2012-12-141-1/+2
* | Revert "Merge pull request #8499 from schneems/schneems/html-route-inspector"Steve Klabnik2012-12-142-27/+2
* | Clear url helper methods when routes are reloadedAndrew White2012-12-141-0/+71
* | Fix failing test in railtiesCarlos Antonio da Silva2012-12-141-2/+1
* | Merge pull request #8499 from schneems/schneems/html-route-inspectorSteve Klabnik2012-12-132-2/+27
|\ \
| * | Output routes in :html formatschneems2012-12-122-2/+27
* | | 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
| |/ /
* / / Fixed test names for generated_attribute_test.rbArun Agrawal2012-12-131-1/+1
|/ /
* | Explain how to supersede the new dynamic welcome pageGeorge Claghorn2012-12-111-0/+2
* | Merge pull request #8468 from schneems/schneems/rack-index-pageSantiago Pastorino2012-12-1010-20/+52
|\ \
| * | Use Rails to Render Default Index Pageschneems2012-12-1010-20/+52
* | | Make sure that no extra spaces are created with a non-polymorphicRafael Mendonça França2012-12-102-4/+8
* | | 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
| * | | Add test case for scaffold_controller generator without attributes.Rafael Mendonça França2012-12-091-0/+9
* | | | Merge pull request #8472 from schneems/schneems/expand_pathRafael Mendonça França2012-12-091-1/+1
|\ \ \ \ | |_|/ / |/| | |