aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ci skip] Replace dead link about HttpOnly cookies.Yoong Kang Lim2015-05-281-1/+1
|
* Merge pull request #20309 from stephen-puiszis/patch-1Rafael Mendonça França2015-05-261-0/+2
|\ | | | | Add info on default layout functionality 3.2 >> 4.0 upgrade
| * 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`.
| * 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]
| * 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 variable
| * | Remove unused variableArun Agrawal2015-05-261-1/+1
|/ / | | | | | | Was left in adfab2dcf4003ca564d78d4425566dd2d9cd8b4f
* / deprecate `Relation#uniq` use `Relation#distinct` instead.Yves Senn2015-05-2612-31/+52
|/ | | | | | | | | See #9683 for the reasons we switched to `distinct`. Here is the discussion that triggered the actual deprecation #20198. `uniq`, `uniq!` and `uniq_value` are still around. They will be removed in the next minor release after Rails 5.
* Merge pull request #16938 from akshay-vishnoi/remove-depricationYves Senn2015-05-265-169/+5
|\ | | | | | | Remove `.superclass_delegating_accessor`.
| * 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 usage
| * | 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]
| * | 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
| * | 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 mistakes
| * | | Fix spelling mistakesYoong Kang Lim2015-05-251-4/+4
| | | |
* | | | Merge pull request #20293 from davydovanton/doc-durationKasper Timm Hansen2015-05-251-0/+4
|\ \ \ \ | |/ / / |/| | | Update documentation for Duration#to_s
| * | | [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]
| | * | | 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
| |\ \ \ | | | | | | | | | | Add documentation for Deprecation::Behavior module
| | * | | [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
|\ \ \ | | | | | | | | Add documentation for DeprecatedConstantProxy#class
| * | | [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
|\ \ \ | | | | | | | | association basics docs fixes
| * | | [ci skip] Fix markdown issue in association basics docs.Tim Wade2015-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | The quoted underscore is being intepreted as markdown, causing the entire phrase to be italicized.
| * | | [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.
| * | | | 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.
| * | | | | Remove deprecation warning.Guo Xiang Tan2015-05-221-1/+1
| |/ / / / | | | | | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/63594316#L1982
* | | | | 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 [ci skip]
| * | | | use keyword arguments in HTTP request methods of assert_difference example ↵yuuji.yaginuma2015-05-241-9/+9
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #20278 from dleve123/cleanup-contributing-docs-sectionClaudio B.2015-05-231-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Cleanup docs for contributing to rails docs
| * | | | | Reword sentences in contributing docs for clarity.Daniel Levenson2015-05-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci] - removes use "squash" where it doesn't apply to git - "is a help" -> "helps" - "if your comment simply says" -> "... simply reads"
| * | | | | Reword a sentence about GH Issues in contributing guide.Daniel Levenson2015-05-231-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci] "Everyone's Issues" read pretty weird to me, specifically the use of capitalization. I changed the link text to be "issue list", which seems to better "go with the flow", IMHO.
* | | | | remove useless ivarAaron Patterson2015-05-231-1/+0
| | | | | | | | | | | | | | | | | | | | I should have deleted this earlier with 42e66fac38b54dd53d062fb5d3376218ed2ffdae
* | | | | add a branch to eliminate multiple nil checksAaron Patterson2015-05-231-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | if we add an else conditional to the `presence` check, we can eliminate the second `||` branch in the caller
* | | | | Merge pull request #20275 from prathamesh-sonpatki/remove-div-for-from-guidesArun Agrawal2015-05-231-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Remove div_for from guides [ci skip]
| * | | | Remove div_for from guides [ci skip]Prathamesh Sonpatki2015-05-231-2/+2
|/ / / / | | | | | | | | | | | | Followup of https://github.com/rails/rails/pull/20244.
* | | | move request id manipulation to the request objectAaron Patterson2015-05-222-7/+18
| | | | | | | | | | | | | | | | this way we can keep the knowledge of `env` hash keys in one place.
* | | | Merge pull request #20231 from karanarora/Spelling-fixZachary Scott2015-05-228-9/+9
|\ \ \ \ | |/ / / |/| | | Rails documentation standard is american english. [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-21 10:36:11 +0000