aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Add info on default layout functionality 3.2 >> 4.0 upgradeStephen Puiszis2015-05-261-0/+2
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #20027 from keepcosmos/add-extend-option-on-habtmYves Senn2015-05-263-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | add `extend` option on `has_and_belongs_to_many`.keepcosmos2015-05-263-1/+20
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #20303 from vngrs/remove_redundant_like_from_slice_docYves Senn2015-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove redundant 'like' from doc of slice! method [ci skip]Mehmet Emin İNAÇ2015-05-261-1/+1
* | | | | | | | | | | | | | Merge pull request #20304 from arunagw/aa-remove-unused-variableYves Senn2015-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove unused variableArun Agrawal2015-05-261-1/+1
|/ / / / / / / / / / / / / /
* / / / / / / / / / / / / / deprecate `Relation#uniq` use `Relation#distinct` instead.Yves Senn2015-05-2612-31/+52
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #16938 from akshay-vishnoi/remove-depricationYves Senn2015-05-265-169/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove `.superclass_delegating_accessor`. Refer #14271Akshay Vishnoi2015-05-245-169/+4
* | | | | | | | | | | | | Merge pull request #20296 from vngrs/use_memoization_to_minimize_memory_usageMatthew Draper2015-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use memoization while accessing request headers for minimizing memory usageMehmet Emin İNAÇ2015-05-251-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #20295 from rohandaxini/patch-1Abdelkader Boudih2015-05-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed the grammatical mistake in the sentence [ci skip]Rohan Daxini2015-05-251-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #20248 from ronakjangir47/remove_mochaRafael Mendonça França2015-05-251-18/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove use of mocha in the railties generators tests Ronak Jangir2015-05-221-18/+34
* | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |