Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-09-18 | 1 | -5/+5 |
|\ | |||||
| * | Add missing and remove unnecessary periods in testing.md [ci skip] | Juanito Fatas | 2015-09-05 | 1 | -5/+5 |
| | | |||||
* | | Change AbstractRequest to ActionDispatch::Request | Bradley D | 2015-09-17 | 1 | -1/+1 |
| | | | | | | | | | | | | AbstractRequest has been deprecated, updating to refer to ActionDispatch::Request instead. [ci skip] | ||||
* | | Clarify CSRF <script> purpose and protection. Note how to deal with your own ↵ | Jeremy Daer | 2015-09-16 | 2 | -6/+11 |
| | | | | | | | | | | | | | | | | <script> tags. Ref #21618 [ci skip] | ||||
* | | Merge pull request #21644 from AvnerCohen/i18n_backend | Claudio B. | 2015-09-16 | 1 | -1/+1 |
|\ \ | | | | | | | Update documentation to remove 'desirable' suggestion for what is not a clear cut approach | ||||
| * | | Update documentation to remove 'desirable' suggestion for what is not a ↵ | Avner Cohen | 2015-09-16 | 1 | -1/+1 |
| | | | | | | | | | | | | clear cut approach | ||||
* | | | Merge pull request #21618 from designgrill/master | Eileen M. Uchitelle | 2015-09-16 | 2 | -5/+3 |
|\ \ \ | |/ / |/| | | Improved explanation of the <script> tag CSRF behavior | ||||
| * | | Improved explanation of the <script> tag CSRF behavior | Anshul Agrawal | 2015-09-14 | 2 | -5/+3 |
| | | | |||||
* | | | Merge pull request #20897 from lukechesser/guide-fix-for-acceptance-validation | Arthur Nogueira Neves | 2015-09-14 | 1 | -3/+7 |
|\ \ \ | |/ / |/| | | Update Validation guide for acceptance method | ||||
| * | | Update validation guide for acceptance method | Luke Chesser | 2015-07-16 | 1 | -3/+7 |
| | | | |||||
* | | | Merge pull request #21568 from amitsuroliya/mysql_version_update | Rafael Mendonça França | 2015-09-13 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Updated MySQL documentation link to MySQL latest version 5.7 everywhe… | ||||
| * | | | Updated MySQL documentation link to MySQL latest version 5.7 everywhere [ci ↵ | amitkumarsuroliya | 2015-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | skip] Bumps from `5.6` to `5.7` | ||||
* | | | | Remove RHTML reference in Action Controller docs [ci skip] | Lachlan Campbell | 2015-09-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | add description of passing a block to `add_source` [ci skip] | yuuji.yaginuma | 2015-09-10 | 1 | -1/+9 |
|/ / / | | | | | | | | | | block support added in 8cc01e0b2bfa75a613720c535d34e451f5de769c | ||||
* | | | Merge pull request #21333 from imtayadeway/ar-querying-docs | Eileen M. Uchitelle | 2015-09-09 | 1 | -17/+16 |
|\ \ \ | | | | | | | | | Improve the AR querying docs | ||||
| * | | | [ci skip] Update MySQL docs reference to latest | Tim Wade | 2015-09-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Bumps to 5.7 | ||||
| * | | | [ci skip] Improve readability in AR querying guide | Tim Wade | 2015-09-09 | 1 | -16/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | * rewords a few awkwardly worded sentences * adds some punctuation * adds a few missing words | ||||
* | | | | Merge pull request #21512 from X0nic/guides-clarify-timeout-error | Yves Senn | 2015-09-08 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | [Rails Guides] clarify `ActiveRecord::ConnectionTimeoutError` | ||||
| * | | | | [Rails Guides] clarify `ActiveRecord::ConnectionTimeoutError` | Nathan Lee | 2015-09-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original: * ActiveRecord::ConnectionTimeoutError - could not obtain a database connection within 5 seconds. The max pool size is currently 5; consider increasing it: Modified version: * ActiveRecord::ConnectionTimeoutError - could not obtain a database connection within 5.000 seconds (waited 5.000 seconds) [ci skip] | ||||
* | | | | | Replace AR with ActiveRecord to make it more readable [ci skip] | arvind | 2015-09-08 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #21534 from Vratislav/clarify-custom-config-guide | Rafael Mendonça França | 2015-09-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | [Rails Guides] Clarify custom code configuration [ci skip] | ||||
* | | | | | Removed Extra ‘the’ [ci skip] | Ronak Jangir | 2015-09-06 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | fix module name typo in API app guide [ci skip] | yuuji.yaginuma | 2015-09-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | add a description of the return value that was missing [ci skip] | yuuji.yaginuma | 2015-09-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | [ci skip] fix invalid package name for libmysqlclient-dev | Ignatius Reza | 2015-09-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | tested on Ubuntu Desktop 15.04 | ||||
* | | | | typo "description not clear corrected with proper description and ↵ | kishore-mohan | 2015-09-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | action_controller_overview file Rails' -> Rails" [ci skip] | ||||
* | | | | typo fix [ci skip] | amitkumarsuroliya | 2015-09-01 | 1 | -1/+1 |
| | | | | | | | | | | | | sub-project's should be sub-projects' at all places | ||||
* | | | | Merge pull request #17351 from akshat-sharma/master | Rafael Mendonça França | 2015-09-01 | 1 | -0/+10 |
|\ \ \ \ | | | | | | | | | | | | | | | | Add case_sensitive option for confirmation validation | ||||
| * | | | | Add case_sensitive option for confirmation validation | Akshat Sharma | 2015-09-01 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Case :- 1. In case of email confirmation one needs case insensitive comparison 2. In case of password confirmation one needs case sensitive comparison [ci skip] Update Guides for case_sensitive option in confirmation validation | ||||
* | | | | | Merge pull request #21432 from yui-knk/fix/what_change_method_can_reverse | Sean Griffin | 2015-08-30 | 1 | -14/+21 |
|\ \ \ \ \ | | | | | | | | | | | | | [ci skip] Update what methods `Migration#change` can reverse | ||||
| * | | | | | [ci skip] Update what methods `Migration#change` can reverse | yui-knk | 2015-08-31 | 1 | -14/+21 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Documentations and comments about what methods `Migration#change` can reverse is out of date. For example `change_column_default` is now reversible by this [commit](https://github.com/rails/rails/pull/20018). * Comments about `CommandRecorder` dose not match with Rails Guide. For example `add_foreign_key` is listed only on Rails Guide. | ||||
* / | | | | fix typo in method name [ci skip] | yuuji.yaginuma | 2015-08-30 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | [ci skip] Better description for starting up with new Rails project | Shivani | 2015-08-28 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | These changes rephrases the description with better explanation of step by step process. | ||||
* | | | | fix reference to undefined variable in email testing guide [ci skip] | Konstantinos Rousis | 2015-08-28 | 1 | -2/+5 |
| | | | | |||||
* | | | | Merge pull request #21409 from piton4eg/patch-9 | Claudio B. | 2015-08-27 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Fix Configuring Active Record [ci skip] | ||||
| * | | | | Fix Configuring Active Record [ci skip] | Alexey Markov | 2015-08-27 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | remove link to outdated article in plugins guide [ci skip] | yuuji.yaginuma | 2015-08-28 | 1 | -1/+0 |
|/ / / / | | | | | | | | | | | | | linked article is a description of the plugins in Rails 2.1. | ||||
* | | | | remove RackDelegation module | Aaron Patterson | 2015-08-26 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Since all controller instances are required to have a request and response object, RackDelegation is no longer needed (we always have to delegate to the response) | ||||
* | | | | Fix a tiny typo [ci skip] | Robin Dupret | 2015-08-25 | 1 | -1/+2 |
| | | | | |||||
* | | | | A quick pass over the testing guide | Robin Dupret | 2015-08-25 | 1 | -6/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixtures are loaded for all the tests by default (not only model and controller tests). * Fix a few typos and improve the markup at some levels. * Wrap changes to 80 chars [ci skip] | ||||
* | | | | Merge pull request #21354 from yui-knk/fix/migration_file_timestamp | Robin Dupret | 2015-08-24 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | [ci skip] Fix migration file's timestamp | ||||
| * | | | | [ci skip] Fix migration file's timestamp | yui-knk | 2015-08-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | In rails generally migration file's timestamp is "YYYYMMDDHHMMSS". | ||||
* | | | | | Merge pull request #21091 from ↵ | Yves Senn | 2015-08-24 | 1 | -0/+32 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | y-yagi/add_activejob_section_to_instrumentation_guide add Active Job section to instrumentation guide [ci skip] | ||||
| * | | | | add Active Job section to instrumentation guide [ci skip] | yuuji.yaginuma | 2015-08-02 | 1 | -0/+32 |
| | | | | | |||||
* | | | | | Merge pull request #21320 from piton4eg/patch-8 | Yves Senn | 2015-08-24 | 1 | -7/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Small fixes [ci skip] | ||||
| * | | | | | Fix docs for debugging [ci skip]: | Alexey Markov | 2015-08-24 | 1 | -7/+8 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | * fix command list for thread * add omitted end of code * fix description for `continue` and `finish` command | ||||
* | | | | | guides, move incomplete example to corresponding option. #21349 | Yves Senn | 2015-08-24 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] This example is dependent on the `:end_at` option and has been removed from `4-2-stable` (d167b811520a6f800b86c77b805d15505a251bb8) | ||||
* | | | | | Merge branch 'master' of github.com:rails/rails | Vijay Dev | 2015-08-24 | 29 | -556/+689 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/security.md | ||||
| * | | | | | [ci skip] Fix the grammar | yui-knk | 2015-08-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is discussed on https://github.com/rails/rails/pull/21334 | ||||
| * | | | | | Remove a link to the site that seems to be gone. [ci skip] | shunsukeaida | 2015-08-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Followup to #20637. |