aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ci skip] Fix returned values of code sampleyui-knk2015-04-191-6/+6
|
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-04-147-48/+34
|\
| * [ci skip] add missing file extensionMikhail Dieterle2015-04-101-1/+1
| |
| * [ci skip] format rake outputMikhail Dieterle2015-04-101-5/+3
| |
| * [ci skip] fix helper nameMikhail Dieterle2015-04-101-1/+1
| |
| * [ci skip] Wrap with double quotationyui-knk2015-04-101-1/+1
| |
| * [ci skip] Add `,`yui-knk2015-04-081-1/+1
| |
| * [ci skip] Remove unnecessary linesyui-knk2015-04-011-2/+0
| |
| * [ci skip] Add `:`yui-knk2015-04-011-1/+1
| |
| * No need to mention unit tests in testing guide anymoreKir Shatrov2015-03-311-2/+0
| |
| * New test runner syntax in testing guideKir Shatrov2015-03-311-4/+4
| |
| * Suggest new hash syntax in testing guideKir Shatrov2015-03-311-2/+2
| |
| * [ci skip] Remove unnecessary `>`yui-knk2015-03-311-1/+1
| |
| * Don't suggest `bin/rails test controllers`Kir Shatrov2015-03-311-1/+0
| |
| * Add missing "of" to testing guide.Hendy Tanata2015-03-301-1/+1
| |
| * Merge branch 'kirs'Matthew Draper2015-03-301-30/+23
| |\
| | * Switch to `bin/rails test` in testing guideKir Shatrov2015-03-301-30/+23
| | | | | | | | | rails/rails#18305
* | | Merge pull request #19742 from vngrs/config_autoload_paths_wrong_docCarlos Antonio da Silva2015-04-131-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-131-3/+1
| | | | | | | | | | | | | | | | config.autoload_paths is not changeable from environment specific configuration files.
* | | | Improve note about unique index and foreign key on has_one associationCarlos Antonio da Silva2015-04-131-6/+7
| | | | | | | | | | | | | | | | Related to f1af967e0055a33c45071848a049ff342e9c291e. [ci skip]
* | | | Merge pull request #19741 from greysteil/add-note-about-partial-index-supportYves Senn2015-04-131-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | Document that partial indexes are only supported by Postgres and SQLite.
| * | | | Document that partial indexes are only supported by Postgres and SQLite.Grey Baker2015-04-132-0/+8
|/ / / / | | | | | | | | | | | | Fixes #18106
* | | | Merge branch 'feature/doc_request_forgery_protection_for_api'Zachary Scott2015-04-121-7/+17
|\ \ \ \
| * | | | Add note regarding CSRF for APIs, as a use-case for skipping it [ci skip]Zachary Scott2015-04-121-0/+4
| | | | |
| * | | | Apply comments from @jeremy regarding why HTML and Javascript requestsZachary Scott2015-04-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specifically are checked for CSRF, when dealing with the browser. [ci skip]
| * | | | update request_forgery_protection docs [ci skip]Vladimir Lyzo2015-04-121-7/+8
|/ / / /
* | | | Add a note regarding add_column restricted API [ci skip]Zachary Scott2015-04-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | We should document current behavior, and this is design of API for now. Closes #17597
* | | | Merge branch 'master' of github.com:rails/railsZachary Scott2015-04-123-31/+3
|\ \ \ \
| * | | | Revert "Merge pull request #19682 from ↵Santiago Pastorino2015-04-123-31/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supercaracal/fix_force_ssl_redirection_flash_error" This reverts commit d215620340be7cb29e2aa87aab22da5ec9e6e6a7, reversing changes made to bbbbfe1ac02162ecb5e9a7b560134a3221f129f3.
* | | | | Add note wrt foreign key constraint to ensure data integrityZachary Scott2015-04-121-0/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | Thanks for patch @sgrif :trollface: Closes #18216
* | | | Apply edits from @senny to close #19397 [ci skip]Zachary Scott2015-04-121-4/+1
| | | |
* | | | Apply comments from @rafaelfranca: we shouldn't recommend you use scaffold cssZachary Scott2015-04-121-9/+0
| | | | | | | | | | | | | | | | Closes #19492 and fixes #19453
* | | | Merge branch 'patch-1'Zachary Scott2015-04-121-3/+5
|\ \ \ \
| * | | | Enhance documentation of pluck with a hint to ids [ci skip]wingfire2015-04-121-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Documentation is giving an example that can be replaced by a more dry command. Give a hint that ids can be used instead of pluck(:id).
* | | | | Merge pull request #19564 from jonatack/counter_cache_docsZachary Scott2015-04-121-3/+11
|\ \ \ \ \ | | | | | | | | | | | | [skip ci] Fix counter_cache in the Rails Guides
| * | | | | [skip ci] Fix counter_cache in the Rails GuidesJon Atack2015-03-281-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.
* | | | | | Fix (intermittent?) test failureMatthew Draper2015-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't actually need to enumerate the possible types here any more; that dates back to before e105e599e706780905d4c348394da989de3b200f, when they were symbols, and indistinguishable from other options.
* | | | | | Merge pull request #19738 from ojab/squishXavier Noria2015-04-121-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Speedup String#squish
| * | | | | | Speedup String#squishojab2015-04-121-2/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'nishantmodak-view_paths'Zachary Scott2015-04-121-1/+33
|\ \ \ \ \ \
| * | | | | | Some copy edits for modifying View Paths [ci skip]Zachary Scott2015-04-121-5/+21
| | | | | | |
| * | | | | | Merge branch 'view_paths' of https://github.com/nishantmodak/rails into ↵Zachary Scott2015-04-121-1/+17
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | nishantmodak-view_paths
| * | | | | | view paths docs [ci skip]Nishant Modak2015-04-131-1/+17
| | | | | | |
* | | | | | | Merge branch 'mfazekas-action-mailer-async-doc-fixes'Zachary Scott2015-04-121-8/+11
|\ \ \ \ \ \ \
| * | | | | | | Since the delegator wasn't identified earlier, we should here [ci skip]Zachary Scott2015-04-121-2/+2
| | | | | | | |
| * | | | | | | Merge branch 'action-mailer-async-doc-fixes' of ↵Zachary Scott2015-04-121-8/+11
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mfazekas/rails into mfazekas-action-mailer-async-doc-fixes Conflicts: actionmailer/lib/action_mailer/base.rb
| * | | | | | | Fixes to inaccurate documentation in action_mailer [ci skip]Miklos Fazkeas2014-12-181-8/+11
| | | | | | | |
* | | | | | | | :scissors:Zachary Scott2015-04-121-2/+2
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #19735 from Dan-Burnette/fixSecretKeyBaseErrorMessageGodfrey Chan2015-04-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Error message no longer tells you to set the (deprecated) secret_token.
| * | | | | | | Error message no longer tells you to set the (deprecated) secret_token.Dan2015-04-121-1/+1
|/ / / / / / /