Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | 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 | |
| | | | | ||||||
* | | | | rm rm_f that is not in use | Akira Matsuda | 2017-01-18 | 1 | -5/+0 | |
|/ / / | ||||||
* | | | Merge pull request #27632 from dixpac/repo_initialize | Rafael Mendonça França | 2017-01-18 | 4 | -2/+20 | |
|\ \ \ | | | | | | | | | | | | | Initalize git repo when creatin new rails app | |||||
| * | | | Initalize git repo when creatin new rails app | dixpac | 2017-01-12 | 4 | -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_generator | Rafael França | 2017-01-18 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | match indentations in environment template | |||||
| * | | | | match indentations | nin042 | 2017-01-12 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #27665 from kenta-s/improve-compute_asset_extname | Rafael França | 2017-01-18 | 1 | -1/+5 | |
|\ \ \ \ \ | | | | | | | | | | | | | compute_asset_extname should explicitly return nil in else clause | |||||
| * | | | | | should explicitly returns nil in else clause | kenta-s | 2017-01-13 | 1 | -1/+5 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #27693 from kenta-s/improve-to_sentence-method | Rafael França | 2017-01-18 | 2 | -1/+11 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix unexpected behavior of `to_sentence` with $, | |||||
| * | | | | | Fix unexpected behavior of with $, | kenta-s | 2017-01-15 | 2 | -1/+11 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #27688 from kenta-s/add-test-for-safe_join | Rafael França | 2017-01-18 | 1 | -0/+5 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add test for `safe_join` | |||||
| * | | | | | | Add test for safe_join | kenta-s | 2017-01-15 | 1 | -0/+5 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #27719 from matrix9180/action_cable_docs_update | Rafael França | 2017-01-18 | 1 | -3/+22 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [WIP] Update ActionCable guide to better describe SubscriptionAdapter config | |||||
| * | | | | | | | Update ActionCable guide to better describe SubscriptionAdapter configuration. | Chad Ingram | 2017-01-17 | 1 | -3/+22 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #27425 from matrix9180/action_cable_channel_prefix | Rafael França | 2017-01-18 | 8 | -0/+72 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add channel_prefix support to AC redis/evented_redis adapters | |||||
| * | | | | | | | | Add channel_prefix support to ActionCable redis/evented_redis adapters. | Chad Ingram | 2017-01-17 | 8 | -0/+72 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #27713 from coreyward/module_freeze_parent_name | Rafael França | 2017-01-17 | 3 | -32/+41 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Module#parent_name broken for frozen classes | |||||
| * | | | | | | | Adjust `Module.parent_name` to work when frozen; fixes #27637 | Corey Ward | 2017-01-17 | 3 | -32/+41 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #27718 from kamipo/remove_internal_public_methods | Rafael França | 2017-01-17 | 6 | -23/+18 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Remove `initialize_schema_migrations_table` and `initialize_internal_metadata_table` internal public methods | |||||
| * | | | | | | | Remove `initialize_schema_migrations_table` and ↵ | Ryuta Kamizono | 2017-01-18 | 6 | -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_rake | Rafael França | 2017-01-17 | 3 | -3/+5 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | allow to pass describe option to rake | |||||
| * | | | | | | | allow to pass describe option to rake | yuuji.yaginuma | 2017-01-17 | 3 | -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 violations | Rafael Mendonça França | 2017-01-17 | 4 | -19/+16 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #27697 from toshimaru/rubocop-update | Rafael Mendonça França | 2017-01-17 | 3 | -7/+7 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rubocop | |||||
| * | | | | | | | | Rename AlignWith to EnforcedStyleAlignWith | toshimaru | 2017-01-16 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | update rubocop to 0.47 | toshimaru | 2017-01-16 | 2 | -6/+6 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #27717 from JunichiIto/fix-byebug-platform | Rafael França | 2017-01-17 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Install Byebug gem as default in Windows (mingw and x64_mingw) platform. | |||||
| * | | | | | | | | | Change `platform` to `platforms` | Junichi Ito | 2017-01-18 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Install Byebug gem as default in Windows (mingw and x64_mingw) platform. | Junichi Ito | 2017-01-18 | 2 | -1/+5 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #27716 from kenta-s/remove-unused-variable-regex | Rafael França | 2017-01-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | Remove unused variable 'regex' | |||||
| * | | | | | | | | | Remove unused variable 'regex' | kenta-s | 2017-01-18 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #27712 from coreyward/resolve_decode_test_warning | Rafael França | 2017-01-17 | 1 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use appropriate assertion based on expectation |