Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Consistency: Rails master -> edge Rails [ci skip] | Godfrey Chan | 2015-04-20 | 1 | -1/+1 |
| | |||||
* | Fix typos in contributing guide [ci skip] | Godfrey Chan | 2015-04-19 | 1 | -2/+2 |
| | | | | | * includes -> include * "on your computer" is implied | ||||
* | Better explain the bug report templates [ci skip] | Godfrey Chan | 2015-04-19 | 1 | -9/+13 |
| | |||||
* | Add a "generic" bug report template | Godfrey Chan | 2015-04-19 | 2 | -0/+41 |
| | | | | | This template gives contributors a starting point to use when reporting bugs that does not involve Active Record or Action Pack. | ||||
* | Update 4_2_release_notes.md | Tony Pitale | 2015-04-19 | 1 | -3/+2 |
| | |||||
* | Merge pull request #19799 from yui-knk/fix/wrap_doc2 | Arthur Nogueira Neves | 2015-04-19 | 1 | -2/+2 |
|\ | | | | | [ci skip] Fix docs and guide about 'Array.wrap' | ||||
| * | [ci skip] Fix docs and guide about 'Array.wrap' | yui-knk | 2015-04-19 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #19812 from piton4eg/patch-1 | Robin Dupret | 2015-04-19 | 1 | -1/+1 |
|\ \ | | | | | | | Update association_basics.md [ci skip] | ||||
| * | | Update association_basics.md | Markov Alexey | 2015-04-19 | 1 | -1/+1 |
| | | | |||||
* | | | Spell out "asynchronously" instead of async in guides [ci skip] | Prathamesh Sonpatki | 2015-04-19 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #19806 from vircung/master | Yves Senn | 2015-04-18 | 1 | -0/+23 |
|\ \ | | | | | | | | | | Improve documentation for uuid [ci skip] | ||||
| * | | Improve documentation [ci skip] | Jacek Nakonieczny | 2015-04-18 | 1 | -0/+25 |
|/ / | | | | | | | Add information about usage `uuid` type with `reference` | ||||
* / | [ci skip] Replace `list` with `array` | yui-knk | 2015-04-18 | 1 | -1/+1 |
|/ | |||||
* | [ci skip] Update code example of Enumerable#without | yui-knk | 2015-04-17 | 1 | -1/+1 |
| | |||||
* | add active job testing section [ci skip] | David Fernandez | 2015-04-16 | 1 | -0/+7 |
| | |||||
* | Correct small typo. | Hank Beaver | 2015-04-15 | 1 | -1/+1 |
| | | | | * files are written to hard "disk" not "disc". | ||||
* | Fix typos and improve the documentation | Jon Atack | 2015-04-15 | 7 | -22/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a squash of the following commits, from first to last: - Fix minor, random things I’ve come across lately that individually did not seem worth making a PR for, so I saved them for one commit. One common error is using “it’s” (which is an abbreviation of “it is”) when the possessive “its” should be used for indicating possession. - Changes include the name of a test, so remove the `[skip ci]` (thanks @senny). - Line wrap the changes at 80 chars and add one more doc fix. - Add a missing line wrap in the Contributing to Ruby on Rails Guide. - Line wrap the `TIP` section in the Contributing to Ruby on Rails Guide as well. Rendering the guide locally with `bundle exec rake guides:generate` did not show any change in on-screen formatting after adding the line wrap. The HTML generated is (extra line added to illustrate where the line wrap takes place): <div class="info"><p>Please squash your commits into a single commit when appropriate. This simplifies future cherry picks and also keeps the git log clean.</p></div> - Squash commits. | ||||
* | Merge pull request #19446 from ↵ | Zachary Scott | 2015-04-14 | 1 | -4/+6 |
|\ | | | | | | | | | andersonDadario/fix_security_guide_captcha_03_21_2015 Fix security guide captcha 03 21 2015 [ci skip] | ||||
| * | [ci skip] Fix for Security Guide - Captcha Section | Anderson Dadario | 2015-03-22 | 1 | -4/+6 |
| | | |||||
* | | Removing GZip section since Sprockets 3.0 no longer create .gz files [ci skip] | Andrey Nering | 2015-04-14 | 1 | -35/+0 |
| | | | | | | | | | | - https://github.com/rails/sprockets/commit/14b3b2eddac4699c64c051888e3801732b9a4418 - https://github.com/rails/sprockets/issues/26 | ||||
* | | Merge pull request #19753 from jonatack/use-ruby-2-2-2 | Guillermo Iguaran | 2015-04-13 | 2 | -3/+3 |
|\ \ | | | | | | | Upgrade to Ruby 2.2.2 | ||||
| * | | Upgrade to Ruby 2.2.2 | Jon Atack | 2015-04-14 | 2 | -3/+3 |
| | | | | | | | | | | | | and fix the grammar in the ruby_version_check.rb user message. | ||||
* | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-04-14 | 5 | -46/+32 |
|\ \ \ | |||||
| * | | | [ci skip] add missing file extension | Mikhail Dieterle | 2015-04-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] format rake output | Mikhail Dieterle | 2015-04-10 | 1 | -5/+3 |
| | | | | |||||
| * | | | [ci skip] fix helper name | Mikhail Dieterle | 2015-04-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] Wrap with double quotation | yui-knk | 2015-04-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] Remove unnecessary lines | yui-knk | 2015-04-01 | 1 | -2/+0 |
| | | | | |||||
| * | | | [ci skip] Add `:` | yui-knk | 2015-04-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | No need to mention unit tests in testing guide anymore | Kir Shatrov | 2015-03-31 | 1 | -2/+0 |
| | | | | |||||
| * | | | New test runner syntax in testing guide | Kir Shatrov | 2015-03-31 | 1 | -4/+4 |
| | | | | |||||
| * | | | Suggest new hash syntax in testing guide | Kir Shatrov | 2015-03-31 | 1 | -2/+2 |
| | | | | |||||
| * | | | Don't suggest `bin/rails test controllers` | Kir Shatrov | 2015-03-31 | 1 | -1/+0 |
| | | | | |||||
| * | | | Add missing "of" to testing guide. | Hendy Tanata | 2015-03-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'kirs' | Matthew Draper | 2015-03-30 | 1 | -30/+23 |
| |\ \ \ | |||||
| | * | | | Switch to `bin/rails test` in testing guide | Kir Shatrov | 2015-03-30 | 1 | -30/+23 |
| | | | | | | | | | | | | | | | rails/rails#18305 | ||||
* | | | | | Merge pull request #19742 from vngrs/config_autoload_paths_wrong_doc | Carlos Antonio da Silva | 2015-04-13 | 1 | -3/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix the wrong documentation about config.autoload_paths [ci skip] | ||||
| * | | | | | Fix the wrong documentation about config.autoload_paths [ci skip] | Mehmet Emin İNAÇ | 2015-04-13 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | config.autoload_paths is not changeable from environment specific configuration files. | ||||
* | | | | | | Improve note about unique index and foreign key on has_one association | Carlos Antonio da Silva | 2015-04-13 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | Related to f1af967e0055a33c45071848a049ff342e9c291e. [ci skip] | ||||
* | | | | | | Add note wrt foreign key constraint to ensure data integrity | Zachary Scott | 2015-04-12 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks for patch @sgrif :trollface: Closes #18216 | ||||
* | | | | | | Apply comments from @rafaelfranca: we shouldn't recommend you use scaffold css | Zachary Scott | 2015-04-12 | 1 | -9/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #19492 and fixes #19453 | ||||
* | | | | | | Merge pull request #19564 from jonatack/counter_cache_docs | Zachary Scott | 2015-04-12 | 1 | -3/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [skip ci] Fix counter_cache in the Rails Guides | ||||
| * | | | | | | [skip ci] Fix counter_cache in the Rails Guides | Jon Atack | 2015-03-28 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the AR Associations Guide, this PR fixes: - The counter_cache declaration is now shown only in the `belongs_to` association. - The docs stated that the counter_cache declaration needs to be on the `has_many` side; now corrected to the `belongs_to` side. - Split the custom column explanation out to a separate paragraph. - Simplify the NOTE because it is true both with and without a custom column name. | ||||
* | | | | | | | Some copy edits for modifying View Paths [ci skip] | Zachary Scott | 2015-04-12 | 1 | -5/+21 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'view_paths' of https://github.com/nishantmodak/rails into ↵ | Zachary Scott | 2015-04-12 | 1 | -1/+17 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | nishantmodak-view_paths | ||||
| * | | | | | | view paths docs [ci skip] | Nishant Modak | 2015-04-13 | 1 | -1/+17 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #19732 from wazery/patch-2 | Kasper Timm Hansen | 2015-04-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [ci skip] Update contributing guide | ||||
| * | | | | | | | [ci skip] Update contributing guide | Islam Wazery | 2015-04-12 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Fix a few typos and wrap some lines [ci skip] | Robin Dupret | 2015-04-12 | 1 | -3/+4 |
| | | | | | | | | |||||
* | | | | | | | | remove reference to `register_javascript_expansion` and ↵ | yuuji.yaginuma | 2015-04-12 | 1 | -26/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `register_stylesheet_expansion` from guide [ci skip] These methods no longer exists. |