aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #27731 from maclover7/jm-fix-27719Jon Moss2017-01-181-8/+10
|\ \ \
| * | | Various style + grammar fixes for #27719Jon Moss2017-01-181-8/+10
|/ / /
* | | Use ActionDispatch::IntegrationTest http helper methodsAndrew White2017-01-181-45/+41
* | | 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 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]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]kenta-s2017-01-181-1/+1
* | | | Revert "I guess we're ready for the randomized tests now"Akira Matsuda2017-01-182-4/+3
|/ / /
* | | :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.rakeyuuji.yaginuma2017-01-181-0/+1
* | | | Merge pull request #27723 from HISAS/update_i18n_pluralization_linksRobin Dupret2017-01-181-1/+1
|\ \ \ \
| * | | | 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
* | | | 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 appdixpac2017-01-124-2/+20
* | | | Merge pull request #27653 from s-jcs/feature/adjust_indentation_for_generatorRafael França2017-01-181-1/+1
|\ \ \ \
| * | | | match indentationsnin0422017-01-121-1/+1
* | | | | Merge pull request #27665 from kenta-s/improve-compute_asset_extnameRafael França2017-01-181-1/+5
|\ \ \ \ \
| * | | | | 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 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_joinkenta-s2017-01-151-0/+5
* | | | | | | Merge pull request #27719 from matrix9180/action_cable_docs_updateRafael França2017-01-181-3/+22
|\ \ \ \ \ \ \
| * | | | | | | 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 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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...Ryuta Kamizono2017-01-186-23/+18
* | | | | | | | 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 rakeyuuji.yaginuma2017-01-173-3/+5
* | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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'kenta-s2017-01-181-1/+1
|/ / / / / / / / /