Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20310 from guigs/patch-1 | Rafael Mendonça França | 2015-05-26 | 1 | -1/+1 |
|\ | | | | | Fix email with name format in Guides. [ci skip] | ||||
| * | Fix email with name format in Guides. [ci skip] | Guilherme Goettems Schneider | 2015-05-26 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #20208 from gaurish/raise_on_missing_ordered_options | Rafael Mendonça França | 2015-05-26 | 3 | -1/+39 |
|\ | | | | | | | Add bang version to OrderedOptions | ||||
| * | Add bang version to OrderedOptions | Gaurish Sharma | 2015-05-23 | 3 | -1/+36 |
| | | | | | | | | | | | | By: Aditya Sanghi(@asanghi) Gaurish Sharma(gaurish) | ||||
* | | Merge pull request #20305 from ↵ | Rafael Mendonça França | 2015-05-26 | 1 | -3/+5 |
|\ \ | | | | | | | | | | | | | vngrs/missing_docs_and_no_docs_for_action_dispatch_request Add missing nodocs and docs for ActionDispatch::Request [ci skip] | ||||
| * | | Add missing nodocs and docs for ActionDispatch::Request [ci skip] | Mehmet Emin İNAÇ | 2015-05-26 | 1 | -3/+5 |
| | | | | | | | | | | | | add missing dot to end of the doc | ||||
* | | | Merge pull request #20309 from stephen-puiszis/patch-1 | Rafael Mendonça França | 2015-05-26 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Add info on default layout functionality 3.2 >> 4.0 upgrade | ||||
| * | | | Add info on default layout functionality 3.2 >> 4.0 upgrade | Stephen Puiszis | 2015-05-26 | 1 | -0/+2 |
|/ / / | |||||
* | | | Merge pull request #20027 from keepcosmos/add-extend-option-on-habtm | Yves Senn | 2015-05-26 | 3 | -1/+20 |
|\ \ \ | |/ / |/| | | Add `extend` option on `has_and_belongs_to_many`. | ||||
| * | | add `extend` option on `has_and_belongs_to_many`. | keepcosmos | 2015-05-26 | 3 | -1/+20 |
|/ / | |||||
* | | Merge pull request #20303 from vngrs/remove_redundant_like_from_slice_doc | Yves Senn | 2015-05-26 | 1 | -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-26 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #20304 from arunagw/aa-remove-unused-variable | Yves Senn | 2015-05-26 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Remove unused variable | ||||
| * | | | Remove unused variable | Arun Agrawal | 2015-05-26 | 1 | -1/+1 |
|/ / / | | | | | | | | | | Was left in adfab2dcf4003ca564d78d4425566dd2d9cd8b4f | ||||
* / / | deprecate `Relation#uniq` use `Relation#distinct` instead. | Yves Senn | 2015-05-26 | 12 | -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-deprication | Yves Senn | 2015-05-26 | 5 | -169/+5 |
|\ \ | | | | | | | | | | Remove `.superclass_delegating_accessor`. | ||||
| * | | Remove `.superclass_delegating_accessor`. Refer #14271 | Akshay Vishnoi | 2015-05-24 | 5 | -169/+4 |
| | | | |||||
* | | | Merge pull request #20296 from vngrs/use_memoization_to_minimize_memory_usage | Matthew Draper | 2015-05-26 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Use memoization while accessing request headers for minimizing memory usage | ||||
| * | | | Use memoization while accessing request headers for minimizing memory usage | Mehmet Emin İNAÇ | 2015-05-25 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #20295 from rohandaxini/patch-1 | Abdelkader Boudih | 2015-05-25 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixed the grammatical mistake in the sentence [ci skip] | ||||
| * | | | Fixed the grammatical mistake in the sentence [ci skip] | Rohan Daxini | 2015-05-25 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #20248 from ronakjangir47/remove_mocha | Rafael Mendonça França | 2015-05-25 | 1 | -18/+34 |
|\ \ \ | | | | | | | | | Remove use of mocha in the railties generators tests | ||||
| * | | | Remove use of mocha in the railties generators tests | Ronak Jangir | 2015-05-22 | 1 | -18/+34 |
| | | | | |||||
* | | | | Merge pull request #20294 from yoongkang/american_spelling | Rafael Mendonça França | 2015-05-25 | 1 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Fix spelling mistakes | ||||
| * | | | | Fix spelling mistakes | Yoong Kang Lim | 2015-05-25 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Merge pull request #20293 from davydovanton/doc-duration | Kasper Timm Hansen | 2015-05-25 | 1 | -0/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | Update documentation for Duration#to_s | ||||
| * | | | | [skip ci] Update documentation for Duration#to_s | Anton Davydov | 2015-05-25 | 1 | -0/+4 |
|/ / / / | |||||
* | | | | Merge branch 'master' of github.com:rails/rails | Zachary Scott | 2015-05-24 | 2 | -2/+14 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #20288 from brian-davis/brian-davis | Zachary Scott | 2015-05-24 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Grammar fix to Active Record Basics guide. [ci skip] | ||||
| | * | | | | Grammar fix to Active Record Basics guide. [ci skip] | Brian Davis | 2015-05-24 | 1 | -2/+2 |
| |/ / / / | |||||
| * | | | | Merge pull request #20286 from davydovanton/doc-deprecation-behavior | Abdelkader Boudih | 2015-05-25 | 1 | -0/+12 |
| |\ \ \ \ | | | | | | | | | | | | | Add documentation for Deprecation::Behavior module | ||||
| | * | | | | [skip ci] Add documentation for Deprecation::Behavior module | Anton Davydov | 2015-05-25 | 1 | -0/+12 |
| | |/ / / | |||||
* | / / / | Add missing type reference here | Zachary Scott | 2015-05-24 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | s/contstant/constant re #20282 [ci skip] | Zachary Scott | 2015-05-24 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #20282 from davydovanton/doc-proxy-wrappers | Zachary Scott | 2015-05-24 | 1 | -0/+5 |
|\ \ \ \ | | | | | | | | | | | Add documentation for DeprecatedConstantProxy#class | ||||
| * | | | | [skip ci] Add documentation for DeprecatedConstantProxy#class | Anton Davydov | 2015-05-24 | 1 | -0/+5 |
| |/ / / | |||||
* | | | | Merge pull request #20270 from imtayadeway/tw/association-basics-docs | Claudio B. | 2015-05-24 | 1 | -11/+12 |
|\ \ \ \ | | | | | | | | | | | association basics docs fixes | ||||
| * | | | | [ci skip] Fix markdown issue in association basics docs. | Tim Wade | 2015-05-22 | 1 | -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 Wade | 2015-05-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | [ci skip] Fix grammar/syntax in AR assocation basics. | Tim Wade | 2015-05-22 | 1 | -10/+11 |
| | | | | | |||||
* | | | | | Merge pull request #20265 from benpickles/gitignore-keeps | Santiago Pastorino | 2015-05-24 | 3 | -2/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | Omit .keep in .gitignore when generated with --skip-keeps. | ||||
| * | | | | | Omit .keep in .gitignore when generated with --skip-keeps. | Ben Pickles | 2015-05-22 | 3 | -2/+12 |
| | | | | | | |||||
* | | | | | | Merge pull request #20260 from tgxworld/remove_deprecation_warning | Santiago Pastorino | 2015-05-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove deprecation warning. | ||||
| * | | | | | | Remove deprecation warning. | Guo Xiang Tan | 2015-05-22 | 1 | -1/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/63594316#L1982 | ||||
* | | | | | | Merge pull request #20279 from y-yagi/assert_difference_example | Zachary Scott | 2015-05-23 | 1 | -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.yaginuma | 2015-05-24 | 1 | -9/+9 |
| | |_|_|/ | |/| | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | Merge pull request #20278 from dleve123/cleanup-contributing-docs-section | Claudio B. | 2015-05-23 | 1 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Cleanup docs for contributing to rails docs | ||||
| * | | | | | Reword sentences in contributing docs for clarity. | Daniel Levenson | 2015-05-23 | 1 | -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 Levenson | 2015-05-23 | 1 | -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 ivar | Aaron Patterson | 2015-05-23 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | I should have deleted this earlier with 42e66fac38b54dd53d062fb5d3376218ed2ffdae |