aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Fix merge conflict and rubocop offencesRyuta Kamizono2017-11-071-19/+18
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #30101 from bogdanvlviv/initialization-active_storageRafael França2017-11-0634-104/+385
|\ \ \ \ \ \ \
| * | | | | | | Execution of `active_storage:install` should respect `--quiet` during `rails ...bogdanvlviv2017-11-061-1/+1
| * | | | | | | Rails::Generators::Actions#execute_command allows option `capture`bogdanvlviv2017-11-062-1/+23
| * | | | | | | `rails new` runs `rails active_storage:install`bogdanvlviv2017-11-0616-38/+92
| * | | | | | | Add --skip-active-storage and do so automatically when --skip-active-record i...bogdanvlviv2017-11-0620-65/+270
* | | | | | | | Merge pull request #22435 from yui-knk/fix_engine_route_testRafael Mendonça França2017-11-065-6/+91
|\ \ \ \ \ \ \ \
| * | | | | | | | Make `assert_recognizes` to traverse mounted enginesyui-knk2016-04-235-6/+90
* | | | | | | | | Merge pull request #28360 from kbrock/transaction_fixMatthew Draper2017-11-071-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Properly check transaction in persistenceKeenan Brock2017-11-061-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #22115 from bogdan/refactor-preloaderRafael França2017-11-063-81/+40
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Refactor Preloader CodeBogdan Gusiev2017-11-063-81/+40
* | | | | | | | | Merge pull request #31069 from danott/resolve-minitest-deprecation-in-assert_...Rafael França2017-11-061-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Resolve Minitest 6 deprecation in assert_no_changesDan Ott2017-11-061-1/+6
|/ / / / / / / / /
* | | | | | | | | Fix acronym support in `humanize`Andrew White2017-11-063-1/+25
* | | | | | | | | Merge pull request #31066 from Leyka/patch-1Andrew White2017-11-061-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix french spelling mistake Skander2017-11-061-6/+6
* | | | | | | | | | Merge pull request #30620 from bogdanvlviv/method_signature_prev-next-day-mon...Andrew White2017-11-067-135/+260
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Update "Active Support Core Extensions" guidebogdanvlviv2017-10-241-91/+97
| * | | | | | | | | Allows pass argument for `Time#prev_year` and `Time#next_year`.bogdanvlviv2017-10-247-21/+58
| * | | | | | | | | Allows pass argument for `Time#prev_month` and `Time#next_month`bogdanvlviv2017-10-247-22/+67
| * | | | | | | | | Allows pass argument for `Time#prev_day` and `Time#next_day`bogdanvlviv2017-10-243-6/+43
* | | | | | | | | | Merge pull request #31064 from y-yagi/remove_unused_requireRyuta Kamizono2017-11-061-1/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove unused requireyuuji.yaginuma2017-11-061-1/+0
* | | | | | | | | | Merge pull request #31062 from y-yagi/follow_up_of_31046Rafael França2017-11-051-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Explicitly pass window handle to `resize_window_to`yuuji.yaginuma2017-11-061-1/+1
| |/ / / / / / / / /
* | | | | | | | | | `scoping` should respect current class and STI constraint (#29199)Ryuta Kamizono2017-11-063-1/+25
* | | | | | | | | | Fix preloading polymorphic multi-level through associationRyuta Kamizono2017-11-062-1/+18
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Fix preloading polymorphic association when through association has already l...Ryuta Kamizono2017-11-062-4/+27
|/ / / / / / / /
* | | | | | | | Ensure `apply_join_dependency` for `update_all` and `delete_all` if eager-loa...Ryuta Kamizono2017-11-062-19/+40
* | | | | | | | Ensure `apply_join_dependency` for `collection_cache_key` if eager-loading is...Ryuta Kamizono2017-11-065-3/+17
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #31053 from y-yagi/fix_namespaced_generatorEileen M. Uchitelle2017-11-053-10/+39
|\ \ \ \ \ \ \
| * | | | | | | Generate the correct path in nested scaffold generatoryuuji.yaginuma2017-11-053-10/+39
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #31055 from y-yagi/show_request_forgery_protection_methods...Ryuta Kamizono2017-11-051-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Show `RequestForgeryProtection` methods in api doc [ci skip]yuuji.yaginuma2017-11-051-0/+1
| |/ / / / / /
* | | | | | | Merge pull request #31046 from NARKOZ/fix-capybara-webkit-deprecationEileen M. Uchitelle2017-11-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix Capybara::Webkit::Driver#resize_window deprecation warningNihad Abbasov2017-11-041-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #31014 from aditya-kapoor/doc-fixesEileen M. Uchitelle2017-11-041-1/+7
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] show the correct example to demonstrate inflections.Aditya Kapoor2017-11-011-1/+7
* | | | | | | | s/an/a/Akira Matsuda2017-11-041-1/+1
* | | | | | | | Merge pull request #31048 from bogdanvlviv/improve-docs-for-action_dispatch-r...Ryuta Kamizono2017-11-041-4/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve docs of ActionDispatch::Routing::Mapperbogdanvlviv2017-11-031-4/+14
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #31050 from y-yagi/remove_unused_methodsRyuta Kamizono2017-11-041-8/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove unused `calculate_rounded_number` and `digit_count`yuuji.yaginuma2017-11-041-8/+0
|/ / / / / / /
* | | | | | | Permit configuring Active Storage's job queueGeorge Claghorn2017-11-035-16/+13
* | | | | | | Revert "Merge pull request #31025 from y-yagi/follow_up_31023_part2"Ryuta Kamizono2017-11-031-1/+0
* | | | | | | Merge pull request #31039 from y-yagi/fix_guides_buildRyuta Kamizono2017-11-036-0/+12
|\ \ \ \ \ \ \
| * | | | | | | Specify bundler version in template filesyuuji.yaginuma2017-11-036-0/+12
|/ / / / / / /
* | | | | | | Merge pull request #31038 from y-yagi/remove_unused_classesRafael França2017-11-021-30/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove unused classesyuuji.yaginuma2017-11-031-30/+0
|/ / / / / /