Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add openssl_verify_mode and sync other smtp_settings with API docs | Jared Fine | 2015-05-11 | 1 | -1/+1 |
| | |||||
* | Merge pull request #20112 from eagletmt/doc-fix | Rafael Mendonça França | 2015-05-11 | 1 | -1/+1 |
|\ | | | | | Fix default value in guide [ci skip] | ||||
| * | Fix default value in guide [ci skip] | Kohei Suzuki | 2015-05-12 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #20111 from ankit8898/railtie_test_refac | Rafael Mendonça França | 2015-05-11 | 2 | -3/+0 |
|\ \ | | | | | | | removing unused and already required require's | ||||
| * | | removing unused and already required require's | Ankit Gupta | 2015-05-11 | 2 | -3/+0 |
| |/ | | | | | | | | | custom test - Does not include EnvHelpers and the require is not needed path generation test - require abstract_unit which has . rails/all requires rails and corresponding | ||||
* | | remove mysterious file added with #20105 :sparkles: | Yves Senn | 2015-05-11 | 1 | -0/+0 |
| | | | | | | | | /cc @claudiob | ||||
* | | Merge pull request #20105 from claudiob/rails31-is-out | Yves Senn | 2015-05-11 | 2 | -2/+1 |
|\ \ | |/ |/| | [ci skip] Fix comment, since Rails 3.1 is out | ||||
| * | [ci skip] Fix comment, since Rails 3.1 is out | claudiob | 2015-05-11 | 2 | -2/+1 |
|/ | |||||
* | Merge pull request #20106 from claudiob/finder-rails3 | Yves Senn | 2015-05-11 | 1 | -14/+2 |
|\ | | | | | [ci skip] Stop explaining finders for Rails 3 | ||||
| * | [ci skip] Stop explaining finders for Rails 3 | claudiob | 2015-05-10 | 1 | -14/+2 |
| | | | | | | | | | | Now that master points at Rails 5, we might not need to explain how things used to work in Rails 3. Or we might… up to you :grin: | ||||
* | | Merge pull request #20100 from claudiob/don-t-skip-rbx-test | Carlos Antonio da Silva | 2015-05-10 | 1 | -2/+0 |
|\ \ | | | | | | | Stop skipping a test that now works on Rubinius | ||||
| * | | Stop skipping a test that now works on Rubinius | claudiob | 2015-05-10 | 1 | -2/+0 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test was skipped because of an issue that, in the meantime, has been fixed: https://github.com/rubinius/rubinius/issues/3328. Using the latest Rubinius (the one currently on Travis CI), this is the result: ```sh $ ruby --version rubinius 2.5.3 (2.1.0 2482b093 2015-05-10 3.5.1 JI) [x86_64-darwin14.3.0] ``` **Before this PR** ```sh $ ruby -Itest test/cases/attribute_assignment_test.rb Run options: --seed 58569 .....S... Finished in 0.048278s, 186.4203 runs/s, 269.2738 assertions/s. 9 runs, 13 assertions, 0 failures, 0 errors, 1 skips You have skipped tests. Run with --verbose for details. ``` **After this PR** $ ruby -Itest test/cases/attribute_assignment_test.rb Run options: --seed 35720 ......... Finished in 0.029441s, 305.6961 runs/s, 475.5273 assertions/s. 9 runs, 14 assertions, 0 failures, 0 errors, 0 skips ``` | ||||
* | | Merge pull request #20101 from imtayadeway/tw/active-record-querying-docs | Zachary Scott | 2015-05-10 | 1 | -2/+3 |
|\ \ | |/ |/| | [ci skip] Improve phrasing on #explain pretty printing. | ||||
| * | [ci skip] Improve phrasing on #explain pretty printing. | Tim Wade | 2015-05-10 | 1 | -2/+3 |
|/ | |||||
* | Merge pull request #20099 from yui-knk/fix/comment_association_cache | Abdelkader Boudih | 2015-05-10 | 1 | -1/+1 |
|\ | | | | | [ci skip] Fix comment of `ActiveRecord::Associations#association_inst… | ||||
| * | [ci skip] Fix comment of `ActiveRecord::Associations#association_instance_get` | yui-knk | 2015-05-11 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #20097 from ankit8898/refac_test_am | Santiago Pastorino | 2015-05-10 | 2 | -2/+0 |
|\ \ | | | | | | | not needed require's | ||||
| * | | not needed require's | Ankit Gupta | 2015-05-10 | 2 | -2/+0 |
| |/ | | | | | | | | | - as core_ext is not used and test pass locally - mail is already required in abstract_unit | ||||
* | | Merge pull request #20096 from yui-knk/fix/testing_guide | Eileen M. Uchitelle | 2015-05-10 | 1 | -1/+1 |
|\ \ | |/ |/| | [ci skip] Fix purpose of `assert_kind_of` | ||||
| * | [ci skip] Fix purpose of `assert_kind_of` | yui-knk | 2015-05-10 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #20094 from vngrs/refactor_railties_commands | Rafael Mendonça França | 2015-05-10 | 4 | -109/+103 |
|\ | | | | | Refactor railties console and dbconsole commands | ||||
| * | Refactor railties console and dbconsole commands | Mehmet Emin İNAÇ | 2015-05-10 | 4 | -109/+103 |
|/ | | | | fix minor convention problems | ||||
* | Merge pull request #20087 from kuldeepaggarwal/fix-engine-guides | Yves Senn | 2015-05-09 | 1 | -2/+2 |
|\ | | | | | correct error text message in engines.md [ci skip] | ||||
| * | [CI SKIP] correct error text message | kuldeepaggarwal | 2015-05-09 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #20086 from farukaydin/before-action-doc | Eileen M. Uchitelle | 2015-05-09 | 1 | -1/+1 |
|\ \ | |/ |/| | promote :except option instead of :only for before action docs [ci skip] | ||||
| * | promote :except option instead of :only for before action docs [ci skip] | Faruk AYDIN | 2015-05-09 | 1 | -1/+1 |
| | | |||||
* | | Move `TemplateAssertions` to their own file | eileencodes | 2015-05-09 | 2 | -188/+189 |
| | | | | | | | | | | | | | | | | | | | | | | This moves `TemplateAssertions` out of the `test_case.rb` file and into it's own `template_assertions` file. It still inherits from `ActionController`.` This is in preparation for combining the code for Integration tests and Controller tests. This will need to be it's own file to be added to the `requires` for Integration tests. This does not currently change ANY behavior, just moving it for access later on. | ||||
* | | Merge pull request #20085 from y-yagi/improve_assert_emails_msg | Yves Senn | 2015-05-09 | 3 | -1/+17 |
|\ \ | |/ |/| | `assert_emails` in block form use the given number as expected value | ||||
| * | `assert_emails` in block form use the given number as expected value | yuuji.yaginuma | 2015-05-09 | 3 | -1/+17 |
|/ | |||||
* | Merge pull request #20081 from gouravtiwari/patch-3 | Arun Agrawal | 2015-05-08 | 1 | -2/+2 |
|\ | | | | | minor rdoc syntax fix [ci skip] | ||||
| * | minor rdoc syntax fix [ci skip] | Gourav Tiwari | 2015-05-08 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #20079 from ankit8898/aj_all | Arun Agrawal | 2015-05-08 | 1 | -0/+1 |
|\ | | | | | docs: syncing with the code, adding aj [ci skip] | ||||
| * | docs: syncing with the code, adding aj [ci skip] | Ankit Gupta | 2015-05-08 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #20078 from robertjlooby/fix_generated_features_methods_docs | Rafael Mendonça França | 2015-05-08 | 1 | -1/+1 |
|\ \ | | | | | | | change GeneratedFeatureMethods to GeneratedAssociationMethods in docs | ||||
| * | | change GeneratedFeatureMethods to GeneratedAssociationMethods in docs | Rob Looby | 2015-05-08 | 1 | -1/+1 |
|/ / | | | | | | | the module name was changed in 8e814a0ac0768816974d2bfd68d33d931592751e | ||||
* | | Merge pull request #20064 from kddeisz/qu_provider_job_id | Rafael Mendonça França | 2015-05-08 | 4 | -9/+16 |
|\ \ | | | | | | | Provide provider_job_id to qu adapter. | ||||
| * | | Provide provider_job_id to qu adapter. | Kevin Deisz | 2015-05-07 | 4 | -9/+16 |
| | | | | | | | | | | | | Further work to provide provider_job_id for queue adapters. | ||||
* | | | Merge pull request #20074 from ankit8898/as_core_ext_req_not | Rafael Mendonça França | 2015-05-08 | 2 | -2/+0 |
|\ \ \ | | | | | | | | | as/core_ext require's not used | ||||
| * | | | as/core_ext require's not used | Ankit Gupta | 2015-05-08 | 2 | -2/+0 |
| | |/ | |/| | |||||
* | | | Merge pull request #20075 from gouravtiwari/patch-2 | Rafael Mendonça França | 2015-05-08 | 1 | -8/+12 |
|\ \ \ | | | | | | | | | Better formatted documents [ci skip] | ||||
| * | | | Better formatted documents [ci skip] | Gourav Tiwari | 2015-05-08 | 1 | -8/+12 |
|/ / / | |||||
* | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-05-08 | 7 | -14/+15 |
|\ \ \ | |||||
| * | | | [ci skip] Add an example to ActionView::Helpers::FormBuilder#label | yui-knk | 2015-05-08 | 1 | -0/+1 |
| | | | | |||||
| * | | | Updated titles of headers in Action Mailer guide | Prathamesh Sonpatki | 2015-04-28 | 1 | -2/+2 |
| | | | | |||||
| * | | | Replaced Javascript with JavaScript in guides | Prathamesh Sonpatki | 2015-04-28 | 2 | -2/+2 |
| | | | | |||||
| * | | | Add missing "of" to RequestForgeryProtection doc. | Hendy Tanata | 2015-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | Fix method name for building associated object in nested_model_forms guide | Prathamesh Sonpatki | 2015-04-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] fix count of options for `find_each` | Mikhail Dieterle | 2015-04-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] `deep_dup` is instance method of `Hash` | yui-knk | 2015-04-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] `deep_dup` is instance method of `Array` | yui-knk | 2015-04-21 | 1 | -1/+1 |
| | | | |