Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add documentation about signature_key for MessageEncryptor.new [ci skip] | Benoit Tigeot | 2017-03-15 | 1 | -0/+5 |
| | |||||
* | Merge pull request #27760 from ↵ | Kasper Timm Hansen | 2017-01-21 | 1 | -2/+0 |
|\ | | | | | | | | | kenta-s/remove-unnecessary-comments-in-cache_helper Remove unnecessary comments in cache_helper.rb [ci skip] | ||||
| * | Remove unnecessary comments in cache_helper.rb [ci skip] | kenta-s | 2017-01-21 | 1 | -2/+0 |
| | | |||||
* | | Merge pull request #27761 from scottgonzalez/action-mailer-guide | Vipul A M | 2017-01-21 | 1 | -2/+2 |
|\ \ | | | | | | | Clean up wording in Action Mailer Basics [ci skip] | ||||
| * | | Clean up wording in Action Mailer Basics [ci skip] | Scott González | 2017-01-21 | 1 | -2/+2 |
|/ / | |||||
* / | Add examples for behaviour about redirection with and without options. Fixes ↵ | Vipul A M | 2017-01-21 | 1 | -0/+8 |
|/ | | | | #27715 [ci skip] (#27730) | ||||
* | Merge pull request #27751 from bogdanvlviv/add_missing_comment_out | Rafael França | 2017-01-20 | 1 | -1/+1 |
|\ | | | | | add missing comment out [ci skip] | ||||
| * | add missing comment out [ci skip] | bogdanvlviv | 2017-01-20 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #27748 from y-yagi/add_missing_comment_out | Vipul A M | 2017-01-20 | 1 | -7/+7 |
|\ | | | | | add missing comment out [ci skip] | ||||
| * | add missing comment out [ci skip] | yuuji.yaginuma | 2017-01-20 | 1 | -7/+7 |
| | | |||||
* | | Merge pull request #27624 from elfassy/assert_enqueued_jobs_with_queue_level | Guillermo Iguaran | 2017-01-19 | 2 | -10/+45 |
|\ \ | | | | | | | Specify the queue to be used with assert_enqueued_jobs | ||||
| * | | assert_enqueued_jobs with queue option | Michael Elfassy | 2017-01-18 | 2 | -10/+45 |
| | | | |||||
* | | | Merge pull request #27746 from kenta-s/add-missing-tests-for-template-text | Rafael França | 2017-01-19 | 1 | -0/+16 |
|\ \ \ | |_|/ |/| | | Add missing tests for ActionView::Template::Text | ||||
| * | | Add missing tests for ActionView::Template::Text | kenta-s | 2017-01-20 | 1 | -0/+16 |
|/ / | |||||
* | | Merge pull request #27742 from olivierlacan/patch-1 | Jon Moss | 2017-01-19 | 1 | -4/+6 |
|\ \ | | | | | | | Mention ActiveRecord's config.example.yml | ||||
| * | | Mention ActiveRecord's config.example.yml | Olivier Lacan | 2017-01-19 | 1 | -4/+6 |
|/ / | | | | | | | This will help people figure out what credentials and tables are required to run ActiveRecord specs. | ||||
* | | Merge pull request #27734 from y-yagi/update_create_table_statements_in_sqlite3 | Andrew White | 2017-01-19 | 1 | -2/+2 |
|\ \ | | | | | | | update CREATE TABLE statements generated by `sqlite3` command | ||||
| * | | update CREATE TABLE statements generated by `sqlite3` command | yuuji.yaginuma | 2017-01-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | From SQLite 3.16.0, `IF NOT EXISTS` set to CREATE TABLE statements. Ref: https://www.sqlite.org/src/info/c7021960f5c070fb Fixes #27635. | ||||
* | | | Merge pull request #27733 from kenta-s/add-missing-argument-to-find_templates | Andrew White | 2017-01-19 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | `find_templates` should be able to handle 5 arguments | ||||
| * | | | `find_templates` should be able to handle 5 arguments | kenta-s | 2017-01-19 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #27740 from kamipo/deprecate_internal_methods | Andrew White | 2017-01-19 | 6 | -13/+21 |
|\ \ \ | | | | | | | | | Deprecate `initialize_schema_migrations_table` and `initialize_internal_metadata_table` | ||||
| * | | | Deprecate `initialize_schema_migrations_table` and ↵ | Ryuta Kamizono | 2017-01-20 | 6 | -13/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | `initialize_internal_metadata_table` These internal initialize methods are no longer used internally. | ||||
* | | | | Merge pull request #27736 from Shopify/reduce-numeric-with-format-allocations | Andrew White | 2017-01-19 | 2 | -16/+19 |
|\ \ \ \ | |/ / / |/| | | | Allocation free Integer#to_s | ||||
| * | | | Allocation free Integer#to_s | Jean Boussier | 2017-01-19 | 2 | -16/+19 |
| | | | | |||||
* | | | | Revert "Merge pull request #27718 from kamipo/remove_internal_public_methods" | Matthew Draper | 2017-01-20 | 6 | -13/+18 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 39c77eb1843f79925c7195e8869afc7cb7323682, reversing changes made to 9f6f51be78f8807e18fc6562c57af2fdbf8ccb56. | ||||
* | | | | Merge pull request #27384 from matthewd/bigint-pk-tweaks | Matthew Draper | 2017-01-20 | 5 | -9/+7 |
|\ \ \ \ | | | | | | | | | | | Tweak bigint PK handling | ||||
| * | | | | Tweak bigint PK handling | Matthew Draper | 2017-01-18 | 5 | -9/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't force PKs on tables that have explicitly opted out * All integer-like PKs are autoincrement unless they have an explicit default | ||||
* | | | | | Make Yarn quieter during precompilation as that is typically run by a deploy ↵ | David Heinemeier Hansson | 2017-01-19 | 1 | -1/+1 |
| |/ / / |/| | | | | | | | | | | | tool like Capistrano and we dont need the play-by-play | ||||
* | | | | Merge pull request #27735 from kamipo/add_changelog_entry_for_24743 | Jon Moss | 2017-01-18 | 1 | -2/+6 |
|\ \ \ \ | |_|/ / |/| | | | Add CHANGELOG entry for #24743 | ||||
| * | | | Add CHANGELOG entry for #24743 | Ryuta Kamizono | 2017-01-19 | 1 | -2/+6 |
|/ / / | |||||
* | | | Merge pull request #27731 from maclover7/jm-fix-27719 | Jon Moss | 2017-01-18 | 1 | -8/+10 |
|\ \ \ | | | | | | | | | Various style + grammar fixes for #27719 | ||||
| * | | | Various style + grammar fixes for #27719 | Jon Moss | 2017-01-18 | 1 | -8/+10 |
|/ / / | | | | | | | | | | [ci skip] | ||||
* | | | Use ActionDispatch::IntegrationTest http helper methods | Andrew White | 2017-01-18 | 1 | -45/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | Mixing Rack::Test::Methods into ActionDispatch::IntegrationTest seems to trigger Ruby bug 13107[1]. By using our methods instead of rack-test we shouldn't trigger the bug in Forwardable. [1]: https://bugs.ruby-lang.org/issues/13107 | ||||
* | | | Merge pull request #27728 from y-yagi/only_enhance_when_task_is_defined | Eileen M. Uchitelle | 2017-01-18 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | only enhance when `assets:precompile` task is defined | ||||
| * | | | only enhance when `assets:precompile` task is defined | yuuji.yaginuma | 2017-01-18 | 1 | -1/+3 |
| | | | | |||||
* | | | | Merge pull request #27727 from kenta-s/remove-todos-related-to-exceptron | Eileen M. Uchitelle | 2017-01-18 | 1 | -2/+0 |
|\ \ \ \ | | | | | | | | | | | Remove TODOs related to Exceptron [ci skip] | ||||
| * | | | | Remove TODOs related to Exceptron [ci skip] | kenta-s | 2017-01-18 | 1 | -2/+0 |
|/ / / / | |||||
* | | | | assert_send is going to be deprecated since minitest 5.10.0 | Akira Matsuda | 2017-01-18 | 2 | -2/+2 |
| | | | | |||||
* | | | | Make sure to clear query cache to prevent sporadic test failure | Akira Matsuda | 2017-01-18 | 1 | -0/+4 |
|/ / / | |||||
* | | | Merge pull request #27726 from kenta-s/fix-grammar-in-partial_renderer | Eileen M. Uchitelle | 2017-01-18 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix grammar in partial_renderer.rb [ci skip] | ||||
| * | | | Fix grammar in partial_renderer.rb [ci skip] | kenta-s | 2017-01-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Revert "I guess we're ready for the randomized tests now" | Akira Matsuda | 2017-01-18 | 2 | -4/+3 |
|/ / / | | | | | | | | | | | | | | | | This reverts commit 8c155c932f37fd2de5b530bc076ed60a03bc926c. Not really :cry: | ||||
* | | | :warning: "Use assert_nil if expecting nil. This will fail in MT6." | Akira Matsuda | 2017-01-18 | 1 | -1/+5 |
| | | | |||||
* | | | I guess we're ready for the randomized tests now | Akira Matsuda | 2017-01-18 | 2 | -3/+4 |
| | | | |||||
* | | | Merge pull request #27722 from y-yagi/follow_up_to_b1c08d8 | Kasper Timm Hansen | 2017-01-18 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | load yarn.rake | ||||
| * | | | load yarn.rake | yuuji.yaginuma | 2017-01-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Follow up to b1c08d8d9b921fdcf3813b5c20a0c3fab96eccca | ||||
* | | | | Merge pull request #27723 from HISAS/update_i18n_pluralization_links | Robin Dupret | 2017-01-18 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | update links of pluralization in i18n guide [ci skip] | ||||
| * | | | | update links of pluralization in i18n guide | Hisashi Kamezawa | 2017-01-18 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | :warning: "Use assert_nil if expecting nil. This will fail in MT6." | Akira Matsuda | 2017-01-18 | 7 | -18/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | These are followups for 307065f959f2b34bdad16487bae906eb3bfeaf28, but TBH I'm personally not very much confortable with this style. Maybe we could override assert_equal in our test_helper not to warn? | ||||
* | | | | Unused class for testing since 93559da4826546d07014f8cfa399b64b4a143127 | Akira Matsuda | 2017-01-18 | 1 | -16/+0 |
| | | | |