aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Fixed TypoPrathamesh Sonpatki2013-04-031-1/+1
| * | | | Changed rspec/model directory example to spec/modelsPrathamesh Sonpatki2013-04-031-2/+2
| * | | | Typos/grammar fixesJonathan Roes2013-04-031-3/+3
| * | | | fix formatting typo, + should be `Yves Senn2013-04-031-1/+1
| * | | | add `(association)`_type to schema convetions in AR basics guide.Yves Senn2013-04-031-0/+2
| * | | | link the Active Record pattern to the EAA CatalogYves Senn2013-04-031-4/+5
| * | | | remove trailing whitespace from AR Basics guideYves Senn2013-04-031-94/+94
| * | | | remove broken links from reference section in debugging guide.Yves Senn2013-04-031-3/+0
| * | | | adjust config.ru tempalte used in the rails on rack guideYves Senn2013-04-031-4/+7
| * | | | Merge branch 'master' of github.com:lifo/docrailsOliver Jakubiec2013-04-02310-1667/+4334
| |\ \ \ \
| | * | | | mark relation mutator as :nodoc: [ci skip]Francesco Rodriguez2013-04-021-2/+1
| | * | | | Merge pull request #131 from lazylester/masterGrayson Wright2013-04-021-1/+1
| | |\ \ \ \
| | | * | | | as of Rails 3.2.13 it appears that importing an engine's migration into the h...Les Nightingill2013-03-311-1/+1
| | * | | | | Proofreading tweaks to the Mailer guideJonathan Roes2013-04-011-15/+15
| | * | | | | Merge pull request #129 from rafBM/masterVijay Dev2013-04-011-2/+2
| | |\ \ \ \ \
| | | * | | | | Remove “Sweepers” from Caching TOC and mention Page/Action caching are re...Rafaël Blais Masson2013-03-241-2/+2
| | * | | | | | Merge pull request #132 from hlee/masterKen2013-03-311-1/+1
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | fixed a article link at sitepointKen Lu2013-03-311-1/+1
| | |/ / / / /
| | * | | | | Remove unnecessary / confusing code in exampleJonathan Roes2013-03-311-11/+2
| | * | | | | Fix typoCarson McDonald2013-03-311-1/+1
| | * | | | | minor copy editingNeeraj Singh2013-03-303-4/+9
| | * | | | | Merge branch 'master' of github.com:rails/railsVijay Dev2013-03-30306-1613/+4285
| | |\ \ \ \ \
| | * | | | | | Revert "Using American English spellings over British style spellings"Vijay Dev2013-03-302-5/+5
| * | | | | | | Added a section on Rails Controller naming conventions.Oliver Jakubiec2013-04-021-2/+12
* | | | | | | | Revert "added details to section 4.1.2 of the Asset Pipeline guide, describin...Vijay Dev2013-04-111-29/+1
* | | | | | | | Merge pull request #10175 from vipulnsward/initialize_fixRafael Mendonça França2013-04-111-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | initialize instead of assert to fix warningVipul A M2013-04-111-0/+1
* | | | | | | | | Switched to new naming conventionsNoemj2013-04-112-4/+4
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #10177 from yahonda/test_relation_merging_with_merged_join...Carlos Antonio da Silva2013-04-111-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Address ORA-00979: not a GROUP BY expression errorYasuo Honda2013-04-111-1/+1
* | | | | | | | fixes app_rails_loader_test.rb in Mac OS XXavier Noria2013-04-111-1/+12
* | | | | | | | Merge pull request #10174 from vipulnsward/cleanup_caching_testCarlos Antonio da Silva2013-04-111-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | cleanup statement cache testVipul A M2013-04-111-4/+4
| |/ / / / / /
* / / / / / / fixes remaining lowercase "rails"Xavier Noria2013-04-111-1/+1
|/ / / / / /
* | | | | | application loader refactor and test suite complete rewriteXavier Noria2013-04-112-58/+71
* | | | | | Remove warningCarlos Antonio da Silva2013-04-101-2/+2
* | | | | | Merge pull request #10170 from rubys/editorial_pass_over_generated_gemfileCarlos Antonio da Silva2013-04-102-7/+11
|\ \ \ \ \ \
| * | | | | | Editorial pass over generated GemfileSam Ruby2013-04-102-7/+11
|/ / / / / /
* | | | | | Merge pull request #10152 from Noemj/statement_cacheRafael Mendonça França2013-04-104-0/+108
|\ \ \ \ \ \
| * | | | | | Added statement cacheNoemj2013-04-104-0/+108
* | | | | | | Merge pull request #10168 from neerajdotname/simple_improvementsRafael Mendonça França2013-04-103-5/+39
|\ \ \ \ \ \ \
| * | | | | | | converge three lines into oneNeeraj Singh2013-04-101-3/+1
| * | | | | | | rdoc for some of the methods in JoinDependencyNeeraj Singh2013-04-102-0/+36
| * | | | | | | remove_duplicate_results! should be protectedNeeraj Singh2013-04-101-2/+2
* | | | | | | | Revert "Merge pull request #6226 from gnufied/master"Rafael Mendonça França2013-04-102-34/+6
|/ / / / / / /
* | | | | | | Merge pull request #10164 from neerajdotname/3002-finalRafael Mendonça França2013-04-104-4/+78
|\ \ \ \ \ \ \
| * | | | | | | While merging relations preserve context for joinsJared Armstrong and Neeraj Singh2013-04-104-4/+78
* | | | | | | | Revert "Merge pull request #10158 from steveklabnik/issue_10125"Rafael Mendonça França2013-04-102-19/+2
* | | | | | | | code review of 22e5ab3Xavier Noria2013-04-101-8/+7
* | | | | | | | Merge pull request #10157 from prathamesh-sonpatki/app_loaderXavier Noria2013-04-102-19/+14
|\ \ \ \ \ \ \ \