aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #30629 from yhirano55/add_scope_to_has_one_attached_macroEileen M. Uchitelle2017-09-202-0/+19
|\
| * Add `with_attached_*` scope to `has_one_attached` macroYoshiyuki Hirano2017-09-192-0/+19
* | Merge pull request #30616 from yhirano55/update_layouts_and_renderingEileen M. Uchitelle2017-09-201-17/+19
|\ \
| * | Update Layouts and Rendering in Rails [ci skip]Yoshiyuki Hirano2017-09-171-17/+19
* | | Merge pull request #30623 from manojmj92/manojmj92-oo-key-patchJavan Makhmali2017-09-202-3/+3
|\ \ \
| * | | Fix error message documentationManoj M J2017-09-202-3/+3
* | | | Merge pull request #30657 from yhirano55/fix_restful_wordingRyuta Kamizono2017-09-201-1/+1
|\ \ \ \
| * | | | Use RESTful instead of restfulYoshiyuki Hirano2017-09-201-1/+1
* | | | | Merge pull request #30655 from kuzukuzu/fix_create_join_table_compatibilityRyuta Kamizono2017-09-202-0/+45
|\ \ \ \ \
| * | | | | make create_join_table compatible.Yuki Masutomi2017-09-202-0/+45
|/ / / / /
* | | | | Merge pull request #30659 from y-yagi/follow_up_of_30650Ryuta Kamizono2017-09-201-1/+1
|\ \ \ \ \
| * | | | | Use credentials in `storage.yml` templateyuuji.yaginuma2017-09-201-1/+1
|/ / / / /
* | | | | Use credentials, not secrets, for Active Storage (#30650)Claudio B2017-09-193-6/+6
* | | | | Merge pull request #30656 from yskkin/add_column_docRyuta Kamizono2017-09-201-0/+2
|\ \ \ \ \
| * | | | | Add :comment option for add_column [ci skip]Yoshiyuki Kinjo2017-09-201-0/+2
* | | | | | Merge pull request #30648 from ydakuka/patch-1Javan Makhmali2017-09-193-4/+4
|\ \ \ \ \ \
| * | | | | | Update action_controller_overview.md [ci skip]Yauheni Dakuka2017-09-193-4/+4
* | | | | | | Merge pull request #30653 from y-yagi/remove_unsued_digits_and_rounded_numberRyuta Kamizono2017-09-191-12/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove unused `NumberToRoundedConverter#digits_and_rounded_number`yuuji.yaginuma2017-09-191-12/+0
|/ / / / / /
* | | | | | Merge pull request #30638 from twalpole/capybara_serverEileen M. Uchitelle2017-09-186-20/+11
|\ \ \ \ \ \
| * | | | | | Use the default Capybara registered puma server configurationThomas Walpole2017-09-186-20/+11
|/ / / / / /
* | | | | | Merge pull request #30645 from yhirano55/use_application_job_instead_of_activ...Ryuta Kamizono2017-09-181-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use ApplicationJob instead of ActiveJob::Base in guide [ci skip]Yoshiyuki Hirano2017-09-181-1/+1
|/ / / / /
* | | | | Merge pull request #30643 from gerardc/gerardc/guides-add-active-job-retrying...Ryuta Kamizono2017-09-181-0/+19
|\ \ \ \ \
| * | | | | add section to guides for discarding and retrying active jobs [ci skip]Gerard Cahill2017-09-181-0/+19
|/ / / / /
* | | | | Merge pull request #30642 from ydakuka/quotesRyuta Kamizono2017-09-183-7/+7
|\ \ \ \ \
| * | | | | Fix quotes [ci skip]Yauheni Dakuka2017-09-183-7/+7
* | | | | | Merge pull request #30641 from ydakuka/js-upcaseRyuta Kamizono2017-09-181-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Upcase js [ci skip]Yauheni Dakuka2017-09-181-2/+2
|/ / / / /
* | | | | Merge pull request #30640 from ydakuka/patch-1Ryuta Kamizono2017-09-181-1/+1
|\ \ \ \ \
| * | | | | Remove "the" [ci skip]Yauheni Dakuka2017-09-181-1/+1
|/ / / / /
* | | | | Merge pull request #26707 from jcoleman/add_attribute_names_cache_busting_specRyuta Kamizono2017-09-181-0/+2
|\ \ \ \ \
| * | | | | Add test validating that Model.attribute_names cache is bustedJames Coleman2016-10-041-0/+2
* | | | | | Remove unused delegation to `reflection.options` in `Preloader::Association`Ryuta Kamizono2017-09-182-4/+1
* | | | | | The name of the key on the associated record is abstracted as `reflection.joi...Ryuta Kamizono2017-09-185-23/+14
* | | | | | The name of the key on the owner is abstracted as `reflection.join_foreign_key`Ryuta Kamizono2017-09-184-17/+5
* | | | | | Extract `associate_records_to_owner` to refactor `Preloader::Association`Ryuta Kamizono2017-09-183-20/+14
* | | | | | Merge pull request #30639 from yhirano55/remove_unused_require_in_activestora...George Claghorn2017-09-171-2/+0
|\ \ \ \ \ \
| * | | | | | Remove unused require in ActiveStorage::VariationYoshiyuki Hirano2017-09-181-2/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Fix collided sequence name detectionRyuta Kamizono2017-09-182-1/+44
* | | | | | Remove the code that swapping `scope` and `options`Ryuta Kamizono2017-09-182-8/+3
|/ / / / /
* | | | | `id` (primary key) is not only an integer [ci skip]Ryuta Kamizono2017-09-181-1/+1
* | | | | Ensure returning affected objects for class level `update` and `destroy`Ryuta Kamizono2017-09-182-12/+14
* | | | | Place class level `update`, `destroy`, and `delete` in `Persistence::ClassMet...Ryuta Kamizono2017-09-183-95/+93
* | | | | Early return if `records.empty?` in `Preloader#preload`Ryuta Kamizono2017-09-181-3/+3
* | | | | Don't pass `reflection_scope` to `preload_scope` if `reflection.scope` isn't ...Ryuta Kamizono2017-09-181-1/+3
* | | | | Return `through_scope` only if the scope is not empty scopeRyuta Kamizono2017-09-181-4/+2
* | | | | Remove useless condition in `reset_association`Ryuta Kamizono2017-09-181-2/+1
* | | | | Merge pull request #30637 from bogdanvlviv/add_round_bracket_in_5_1_release_n...Ryuta Kamizono2017-09-181-1/+1
|\ \ \ \ \
| * | | | | Add missing round bracket in "Ruby on Rails 5.1 Release Notes" guidebogdanvlviv2017-09-171-1/+1