aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unused requireyuuji.yaginuma2017-11-061-1/+0
* 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
|/ /
* | Allow third-party previewers/analyzers to customize their tempdirsGeorge Claghorn2017-11-022-3/+10
* | Merge pull request #31034 from haneru/edit-commentEileen M. Uchitelle2017-11-021-1/+1
|\ \
| * | Edited comment from request.rbhaneru2017-11-031-1/+1
* | | Merge pull request #31031 from y-yagi/fix_ruby_warning_when_using_test_toolRyuta Kamizono2017-11-021-1/+1
|\ \ \
| * | | Fix "warning: instance variable @defined_root not initialized"yuuji.yaginuma2017-11-021-1/+1
|/ / /
* | | Merge pull request #31029 from yahonda/ignore_uninstall_bundler_at_ruby_headGuillermo Iguaran2017-11-011-1/+1
|\ \ \
| * | | Ignore "gem "bundler" cannot be uninstalled because it is a default gem" errorYasuo Honda2017-11-011-1/+1
|/ / /
* | | updates autoloading guide for Ruby 2.5 [ci skip]Xavier Noria2017-11-011-1/+9
* | | Fix tests on Mail 2.7Jeremy Daer2017-10-314-23/+18
* | | Merge pull request #31026 from yahonda/diag_mail27Rafael França2017-10-312-0/+4
|\ \ \
| * | | Workaround for ActionMailer failures by not installing mail 2.7Yasuo Honda2017-11-012-0/+4
|/ / /
* | | Merge pull request #31025 from y-yagi/follow_up_31023_part2Guillermo Iguaran2017-10-311-0/+1
|\ \ \
| * | | Remove bundler 1.16.0yuuji.yaginuma2017-11-011-0/+1
|/ / /
* | | Merge pull request #31023 from y-yagi/avoid_latest_bundlerGuillermo Iguaran2017-10-311-1/+1
|\ \ \
| * | | Avoid bundler 1.16.0 for nowyuuji.yaginuma2017-11-011-1/+1
* | | | Fix failing `bundle install` on CIRyuta Kamizono2017-11-011-1/+1
* | | | Enable `Style/RedundantReturn` rubocop rule, and fixed a couple moreRyuta Kamizono2017-11-015-10/+14
|/ / /
* | | Merge pull request #31021 from yahonda/add_all_sequences_to_oracle_ignoredMatthew Draper2017-11-011-1/+1
|\ \ \
| * | | Address incorrect number of queries executed at Oracle enhanced adapterYasuo Honda2017-10-311-1/+1
* | | | Fix grammar issue [ci skip]Rafael França2017-10-311-1/+1
|/ / /
* | | Merge pull request #31013 from dgynn/rescue-layout-white-space-wrappingRafael França2017-10-311-0/+1
|\ \ \ | |_|/ |/| |
| * | Prevent source line wrapping in rescue layoutDave Gynn2017-10-311-0/+1
|/ /
* | Merge pull request #31004 from shuheiktgw/remove_unnecessary_returnsRafael França2017-10-3112-16/+16
|\ \
| * | removed unnecessary returnsShuhei Kitagawa2017-10-2812-16/+16
* | | Merge pull request #31012 from y-yagi/remove_unused_missing_requests_errorRafael França2017-10-302-4/+0
|\ \ \ | |_|/ |/| |
| * | Remove unused `MissingRequestError`yuuji.yaginuma2017-10-312-4/+0
* | | `source_type_scope` should respect correct table aliasRyuta Kamizono2017-10-302-7/+17
* | | `PolymorphicReflection#scopes` is no longer used since a5651eb5Ryuta Kamizono2017-10-301-5/+0