aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | Remove `initialize_schema_migrations_table` and ↵Ryuta Kamizono2017-01-186-23/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `initialize_internal_metadata_table` internal public methods These internal methods accidentally appeared in the doc, and so almost useless. It is enough to create these internal tables directly, and indeed do so in several places. https://github.com/rails/rails/blob/v5.0.1/activerecord/lib/active_record/schema.rb#L55 https://github.com/rails/rails/blob/v5.0.1/activerecord/lib/active_record/railties/databases.rake#L6 https://github.com/rails/rails/blob/v5.0.1/activerecord/lib/active_record/tasks/database_tasks.rb#L230
* | | | | | | Merge pull request #27706 from y-yagi/allow_to_pass_describe_option_to_rakeRafael França2017-01-173-3/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | allow to pass describe option to rake
| * | | | | | allow to pass describe option to rakeyuuji.yaginuma2017-01-173-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `Thor::HELP_MAPPINGS` contains `-D`, so `bin/rails -D` show rails's help. But, in Rails 5.0.1, `bin/rails -D` show the description of rake task. I think that it is better to have the same behavior.
* | | | | | | Fix all rubocop violationsRafael Mendonça França2017-01-174-19/+16
| | | | | | |
* | | | | | | Merge pull request #27697 from toshimaru/rubocop-updateRafael Mendonça França2017-01-173-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update rubocop
| * | | | | | | Rename AlignWith to EnforcedStyleAlignWithtoshimaru2017-01-161-1/+1
| | | | | | | |
| * | | | | | | update rubocop to 0.47toshimaru2017-01-162-6/+6
| | | | | | | |
* | | | | | | | Merge pull request #27717 from JunichiIto/fix-byebug-platformRafael França2017-01-172-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Install Byebug gem as default in Windows (mingw and x64_mingw) platform.
| * | | | | | | | Change `platform` to `platforms`Junichi Ito2017-01-181-1/+1
| | | | | | | | |
| * | | | | | | | Install Byebug gem as default in Windows (mingw and x64_mingw) platform.Junichi Ito2017-01-182-1/+5
| | | | | | | | |
* | | | | | | | | Merge pull request #27716 from kenta-s/remove-unused-variable-regexRafael França2017-01-171-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Remove unused variable 'regex'
| * | | | | | | | Remove unused variable 'regex'kenta-s2017-01-181-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #27712 from coreyward/resolve_decode_test_warningRafael França2017-01-171-2/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use appropriate assertion based on expectation
| * | | | | | | | Use appropriate assertion based on expectationCorey Ward2017-01-171-2/+7
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves a stern Minitest “warning” about an upcoming behavior change in MiniTest 6 that will result in the test failing. https://github.com/seattlerb/minitest/issues/666
* | | | | | | | Move config reset to ensure blockAndrew White2017-01-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to leak the extra migration path to other railties tests.
* | | | | | | | Move config reset to ensure blockAndrew White2017-01-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to leak the extra migration path to other railties tests.
* | | | | | | | Merge pull request #27674 from kjg/migration_generator_honor_path_configAndrew White2017-01-175-2/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Generate migrations at path set by `config.paths["db/migrate"]`
| * | | | | | | | Generate migrations at path set by `config.paths["db/migrate"]`Kevin Glowacz2017-01-165-2/+42
| | | | | | | | |
* | | | | | | | | Merge pull request #27700 from kenta-s/remove-meaningless-line-from-adapter-testAndrew White2017-01-171-1/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove meaningless line from adapter_test.rb
| * | | | | | | | | Remove meaningless line from adapter_test.rbkenta-s2017-01-161-1/+0
| | |_|/ / / / / / | |/| | | | | | |