aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #27733 from kenta-s/add-missing-argument-to-find_templatesAndrew White2017-01-191-2/+2
|\ \ \ | | | | | | | | `find_templates` should be able to handle 5 arguments
| * | | `find_templates` should be able to handle 5 argumentskenta-s2017-01-191-2/+2
| |/ /
* | | Merge pull request #27740 from kamipo/deprecate_internal_methodsAndrew White2017-01-196-13/+21
|\ \ \ | | | | | | | | Deprecate `initialize_schema_migrations_table` and `initialize_internal_metadata_table`
| * | | Deprecate `initialize_schema_migrations_table` and ↵Ryuta Kamizono2017-01-206-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-allocationsAndrew White2017-01-192-16/+19
|\ \ \ \ | |/ / / |/| | | Allocation free Integer#to_s
| * | | Allocation free Integer#to_sJean Boussier2017-01-192-16/+19
| | | |
* | | | Revert "Merge pull request #27718 from kamipo/remove_internal_public_methods"Matthew Draper2017-01-206-13/+18
| | | | | | | | | | | | | | | | | | | | This reverts commit 39c77eb1843f79925c7195e8869afc7cb7323682, reversing changes made to 9f6f51be78f8807e18fc6562c57af2fdbf8ccb56.
* | | | Merge pull request #27384 from matthewd/bigint-pk-tweaksMatthew Draper2017-01-205-9/+7
|\ \ \ \ | | | | | | | | | | Tweak bigint PK handling
| * | | | Tweak bigint PK handlingMatthew Draper2017-01-185-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 Hansson2017-01-191-1/+1
| |/ / / |/| | | | | | | | | | | tool like Capistrano and we dont need the play-by-play
* | | | Merge pull request #27735 from kamipo/add_changelog_entry_for_24743Jon Moss2017-01-181-2/+6
|\ \ \ \ | |_|/ / |/| | | Add CHANGELOG entry for #24743
| * | | Add CHANGELOG entry for #24743Ryuta Kamizono2017-01-191-2/+6
|/ / /
* | | Merge pull request #27731 from maclover7/jm-fix-27719Jon Moss2017-01-181-8/+10
|\ \ \ | | | | | | | | Various style + grammar fixes for #27719
| * | | Various style + grammar fixes for #27719Jon Moss2017-01-181-8/+10
|/ / / | | | | | | | | | [ci skip]
* | | Use ActionDispatch::IntegrationTest http helper methodsAndrew White2017-01-181-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_definedEileen M. Uchitelle2017-01-181-1/+3
|\ \ \ | | | | | | | | only enhance when `assets:precompile` task is defined
| * | | only enhance when `assets:precompile` task is definedyuuji.yaginuma2017-01-181-1/+3
| | | |
* | | | Merge pull request #27727 from kenta-s/remove-todos-related-to-exceptronEileen M. Uchitelle2017-01-181-2/+0
|\ \ \ \ | | | | | | | | | | Remove TODOs related to Exceptron [ci skip]
| * | | | Remove TODOs related to Exceptron [ci skip]kenta-s2017-01-181-2/+0
|/ / / /
* | | | assert_send is going to be deprecated since minitest 5.10.0Akira Matsuda2017-01-182-2/+2
| | | |
* | | | Make sure to clear query cache to prevent sporadic test failureAkira Matsuda2017-01-181-0/+4
|/ / /
* | | Merge pull request #27726 from kenta-s/fix-grammar-in-partial_rendererEileen M. Uchitelle2017-01-181-1/+1
|\ \ \ | | | | | | | | Fix grammar in partial_renderer.rb [ci skip]
| * | | Fix grammar in partial_renderer.rb [ci skip]kenta-s2017-01-181-1/+1
| | | |
* | | | Revert "I guess we're ready for the randomized tests now"Akira Matsuda2017-01-182-4/+3
|/ / / | | | | | | | | | | | | | | | This reverts commit 8c155c932f37fd2de5b530bc076ed60a03bc926c. Not really :cry:
* | | :warning: "Use assert_nil if expecting nil. This will fail in MT6."Akira Matsuda2017-01-181-1/+5
| | |
* | | I guess we're ready for the randomized tests nowAkira Matsuda2017-01-182-3/+4
| | |
* | | Merge pull request #27722 from y-yagi/follow_up_to_b1c08d8Kasper Timm Hansen2017-01-181-0/+1
|\ \ \ | | | | | | | | load yarn.rake
| * | | load yarn.rakeyuuji.yaginuma2017-01-181-0/+1
| | | | | | | | | | | | | | | | Follow up to b1c08d8d9b921fdcf3813b5c20a0c3fab96eccca
* | | | Merge pull request #27723 from HISAS/update_i18n_pluralization_linksRobin Dupret2017-01-181-1/+1
|\ \ \ \ | | | | | | | | | | update links of pluralization in i18n guide [ci skip]
| * | | | update links of pluralization in i18n guideHisashi Kamezawa2017-01-181-1/+1
| |/ / /
* | | | :warning: "Use assert_nil if expecting nil. This will fail in MT6."Akira Matsuda2017-01-187-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 93559da4826546d07014f8cfa399b64b4a143127Akira Matsuda2017-01-181-16/+0
| | | |
* | | | rm rm_f that is not in useAkira Matsuda2017-01-181-5/+0
|/ / /
* | | Merge pull request #27632 from dixpac/repo_initializeRafael Mendonça França2017-01-184-2/+20
|\ \ \ | | | | | | | | | | | | Initalize git repo when creatin new rails app
| * | | Initalize git repo when creatin new rails appdixpac2017-01-124-2/+20
| | | | | | | | | | | | | | | | | | | | * If `--skip-git` is not specified initalize git repo when creating new rails app
* | | | Merge pull request #27653 from s-jcs/feature/adjust_indentation_for_generatorRafael França2017-01-181-1/+1
|\ \ \ \ | | | | | | | | | | match indentations in environment template
| * | | | match indentationsnin0422017-01-121-1/+1
| | | | |
* | | | | Merge pull request #27665 from kenta-s/improve-compute_asset_extnameRafael França2017-01-181-1/+5
|\ \ \ \ \ | | | | | | | | | | | | compute_asset_extname should explicitly return nil in else clause
| * | | | | should explicitly returns nil in else clausekenta-s2017-01-131-1/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #27693 from kenta-s/improve-to_sentence-methodRafael França2017-01-182-1/+11
|\ \ \ \ \ | | | | | | | | | | | | Fix unexpected behavior of `to_sentence` with $,
| * | | | | Fix unexpected behavior of with $,kenta-s2017-01-152-1/+11
| | | | | |
* | | | | | Merge pull request #27688 from kenta-s/add-test-for-safe_joinRafael França2017-01-181-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add test for `safe_join`
| * | | | | | Add test for safe_joinkenta-s2017-01-151-0/+5
| | | | | | |
* | | | | | | Merge pull request #27719 from matrix9180/action_cable_docs_updateRafael França2017-01-181-3/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [WIP] Update ActionCable guide to better describe SubscriptionAdapter config
| * | | | | | | Update ActionCable guide to better describe SubscriptionAdapter configuration.Chad Ingram2017-01-171-3/+22
| | | | | | | |
* | | | | | | | Merge pull request #27425 from matrix9180/action_cable_channel_prefixRafael França2017-01-188-0/+72
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add channel_prefix support to AC redis/evented_redis adapters
| * | | | | | | | Add channel_prefix support to ActionCable redis/evented_redis adapters.Chad Ingram2017-01-178-0/+72
|/ / / / / / / /
* | | | | | | | Merge pull request #27713 from coreyward/module_freeze_parent_nameRafael França2017-01-173-32/+41
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Module#parent_name broken for frozen classes
| * | | | | | | Adjust `Module.parent_name` to work when frozen; fixes #27637Corey Ward2017-01-173-32/+41
| | | | | | | |
* | | | | | | | Merge pull request #27718 from kamipo/remove_internal_public_methodsRafael França2017-01-176-23/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Remove `initialize_schema_migrations_table` and `initialize_internal_metadata_table` internal public methods