aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20294 from yoongkang/american_spellingRafael Mendonça França2015-05-251-4/+4
|\
| * Fix spelling mistakesYoong Kang Lim2015-05-251-4/+4
* | Merge pull request #20293 from davydovanton/doc-durationKasper Timm Hansen2015-05-251-0/+4
|\ \ | |/ |/|
| * [skip ci] Update documentation for Duration#to_sAnton Davydov2015-05-251-0/+4
|/
* Merge branch 'master' of github.com:rails/railsZachary Scott2015-05-242-2/+14
|\
| * Merge pull request #20288 from brian-davis/brian-davisZachary Scott2015-05-241-2/+2
| |\
| | * Grammar fix to Active Record Basics guide. [ci skip]Brian Davis2015-05-241-2/+2
| |/
| * Merge pull request #20286 from davydovanton/doc-deprecation-behaviorAbdelkader Boudih2015-05-251-0/+12
| |\
| | * [skip ci] Add documentation for Deprecation::Behavior moduleAnton Davydov2015-05-251-0/+12
* | | Add missing type reference hereZachary Scott2015-05-241-1/+1
|/ /
* | s/contstant/constant re #20282 [ci skip]Zachary Scott2015-05-241-2/+2
* | Merge pull request #20282 from davydovanton/doc-proxy-wrappersZachary Scott2015-05-241-0/+5
|\ \
| * | [skip ci] Add documentation for DeprecatedConstantProxy#classAnton Davydov2015-05-241-0/+5
| |/
* | Merge pull request #20270 from imtayadeway/tw/association-basics-docsClaudio B.2015-05-241-11/+12
|\ \
| * | [ci skip] Fix markdown issue in association basics docs.Tim Wade2015-05-221-1/+1
| * | [ci skip] Use spaceship operator to indicate precedence.Tim Wade2015-05-221-1/+1
| * | [ci skip] Fix grammar/syntax in AR assocation basics.Tim Wade2015-05-221-10/+11
* | | Merge pull request #20265 from benpickles/gitignore-keepsSantiago Pastorino2015-05-243-2/+12
|\ \ \
| * | | Omit .keep in .gitignore when generated with --skip-keeps.Ben Pickles2015-05-223-2/+12
* | | | Merge pull request #20260 from tgxworld/remove_deprecation_warningSantiago Pastorino2015-05-241-1/+1
|\ \ \ \
| * | | | Remove deprecation warning.Guo Xiang Tan2015-05-221-1/+1
| |/ / /
* | | | Merge pull request #20279 from y-yagi/assert_difference_exampleZachary Scott2015-05-231-9/+9
|\ \ \ \
| * | | | use keyword arguments in HTTP request methods of assert_difference example [c...yuuji.yaginuma2015-05-241-9/+9
* | | | | Merge pull request #20278 from dleve123/cleanup-contributing-docs-sectionClaudio B.2015-05-231-4/+4
|\ \ \ \ \
| * | | | | Reword sentences in contributing docs for clarity.Daniel Levenson2015-05-231-3/+3
| * | | | | Reword a sentence about GH Issues in contributing guide.Daniel Levenson2015-05-231-1/+1
|/ / / / /
* | | | | remove useless ivarAaron Patterson2015-05-231-1/+0
* | | | | add a branch to eliminate multiple nil checksAaron Patterson2015-05-231-3/+5
* | | | | Merge pull request #20275 from prathamesh-sonpatki/remove-div-for-from-guidesArun Agrawal2015-05-231-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove div_for from guides [ci skip]Prathamesh Sonpatki2015-05-231-2/+2
|/ / / /
* | | | move request id manipulation to the request objectAaron Patterson2015-05-222-7/+18
* | | | Merge pull request #20231 from karanarora/Spelling-fixZachary Scott2015-05-228-9/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Spelling/typo/grammatical fixes [ci skip]karanarora2015-05-238-9/+9
|/ / /
* | | Merge pull request #20255 from eliotsykes/link-associations-to-exists-guideYves Senn2015-05-221-2/+6
|\ \ \
| * | | Link association.exists?(...) to API docs [ci skip]Eliot Sykes2015-05-221-2/+6
|/ / /
* | | Merge pull request #20254 from eliotsykes/link-relatively-to-configuring-guideYves Senn2015-05-221-1/+1
|\ \ \
| * | | Make link to configuring guide relative [ci skip]Eliot Sykes2015-05-221-1/+1
|/ / /
* | | Merge pull request #20252 from waynn/patch-5Rafael Mendonça França2015-05-221-1/+1
|\ \ \
| * | | "maybe" => "may be"Waynn Lue2015-05-211-1/+1
|/ / /
* | | Merge pull request #20251 from davydovanton/doc-memory-storeRafael Mendonça França2015-05-212-2/+2
|\ \ \
| * | | [skip ci] Add nodoc label for protected Cache methodsAnton Davydov2015-05-222-2/+2
| | |/ | |/|
* | | Merge pull request #20250 from davydovanton/doc-mem-cache-storeRafael Mendonça França2015-05-211-1/+8
|\ \ \
| * | | [skip ci] Update documentation for MemCacheStore::build_mem_cacheAnton Davydov2015-05-211-1/+8
| |/ /
* | | revises a test to account for case-insensitive file systemsXavier Noria2015-05-211-3/+19
* | | Merge pull request #20247 from davydovanton/doc-array-inquirerAbdelkader Boudih2015-05-211-4/+10
|\ \ \
| * | | [skip ci] Update documentation for ArrayInquirer#any?Anton Davydov2015-05-211-4/+10
| |/ /
* | | Merge pull request #20244 from y-yagi/remove_div_for_from_guideKasper Timm Hansen2015-05-211-20/+0
|\ \ \
| * | | remove reference to `div_for` method from guide [ci skip]yuuji.yaginuma2015-05-211-20/+0
* | | | Merge pull request #20235 from davydovanton/doc-update-dateYves Senn2015-05-211-0/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | [skip ci] Update documentation for Date classAnton Davydov2015-05-211-0/+6
|/ / /