aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added multibyte slice! example to doc [ci skip]Gourav Tiwari2015-05-261-0/+6
|
* 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]
| * | | Spelling/typo/grammatical fixes [ci skip]karanarora2015-05-238-9/+9
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | spelling fix [ci skip] example to be consistent [ci skip] grammatical fix typo fixes [ci skip]
* | | Merge pull request #20255 from eliotsykes/link-associations-to-exists-guideYves Senn2015-05-221-2/+6
|\ \ \ | | | | | | | | Link association.exists?(...) to AR::Base.exists? guide [ci skip]
| * | | 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]
| * | | 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"
| * | | "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
|\ \ \ | | | | | | | | Add nodoc label for protected Cache methods
| * | | [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
|\ \ \ | | | | | | | | Update documentation for MemCacheStore::build_mem_cache [ci skip]
| * | | [skip ci] Update documentation for MemCacheStore::build_mem_cacheAnton Davydov2015-05-211-1/+8
| |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 07:07:28 +0000