aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #30657 from yhirano55/fix_restful_wordingRyuta Kamizono2017-09-201-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use RESTful instead of restful
| * | | | | | 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.
| * | | | | | | 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` template
| * | | | | | | Use credentials in `storage.yml` templateyuuji.yaginuma2017-09-201-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Follow up of #30650
* | | | | | | Use credentials, not secrets, for Active Storage (#30650)Claudio B2017-09-193-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to #30067: > This PR will deprecate secrets.yml* and instead adopt > config/credentials.yml.enc to signify what these secrets are specifically > for: Keeping API keys, database passwords, and any other integration > credentials in one place. [ci skip] since only comments are being edited.
* | | | | | | Merge pull request #30656 from yskkin/add_column_docRyuta Kamizono2017-09-201-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add :comment option for add_column [ci skip]
| * | | | | | | 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]
| * | | | | | | | 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`
| * | | | | | | | Remove unused `NumberToRoundedConverter#digits_and_rounded_number`yuuji.yaginuma2017-09-191-12/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | `digits_and_rounded_number` is unused since #26628
* | | | | | | | Merge pull request #30638 from twalpole/capybara_serverEileen M. Uchitelle2017-09-186-20/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use the default Capybara registered puma server configuration
| * | | | | | | | Use the default Capybara registered puma server configurationThomas Walpole2017-09-186-20/+11
|/ / / / / / / /
* | | | | | | | Merge pull request #30645 from ↵Ryuta Kamizono2017-09-181-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | yhirano55/use_application_job_instead_of_active_job_base Use ApplicationJob instead of ActiveJob::Base in guide [ci skip]
| * | | | | | | Use ApplicationJob instead of ActiveJob::Base in guide [ci skip]Yoshiyuki Hirano2017-09-181-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #30643 from ↵Ryuta Kamizono2017-09-181-0/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gerardc/gerardc/guides-add-active-job-retrying-discarding-section Add section to guides for discarding and retrying active jobs [ci skip]
| * | | | | | | 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]
| * | | | | | | 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]
| * | | | | | | 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]
| * | | | | | | 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 busted
| * | | | | | | 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 ↵Ryuta Kamizono2017-09-185-23/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `reflection.join_primary_key`
* | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we have `Preloader#preload`, `Preloader::Association#preload` is a little confusing. And also, since the `preload` method is an abstract method, it is hard to read where `associated_records_by_owner` is called. This refactors `Preloader::Association` to ease to read where `associated_records_by_owner` is called.
* | | | | | | | Merge pull request #30639 from ↵George Claghorn2017-09-171-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yhirano55/remove_unused_require_in_activestorage_variation Remove unused require in ActiveStorage::Variation
| * | | | | | | | Remove unused require in ActiveStorage::VariationYoshiyuki Hirano2017-09-181-2/+0
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Fix collided sequence name detectionRyuta Kamizono2017-09-182-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If collided named sequence already exists, newly created serial column will generate alternative sequence name. Fix sequence name detection to allow the alternative names.
* | | | | | | | Remove the code that swapping `scope` and `options`Ryuta Kamizono2017-09-182-8/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | `options` is never assigned to `scope` as long as using splat hash.
* | | | | | | `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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Class level `update` and `destroy` are using `find` in the internal, so it will raise `RecordNotFound` if given ids cannot find an object even though the method already affect (update or destroy) to any objects. These methods should return affected objects even in that case.
* | | | | | | Place class level `update`, `destroy`, and `delete` in ↵Ryuta Kamizono2017-09-183-95/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Persistence::ClassMethods` The docs are obviously for class level `update`, `destroy`, and `delete`. It should be placed in `Persistence::ClassMethods` rather than `Relation`. And also, these methods are not dependent on relation. So it is not needed to delegate to `all` (plus, `klass.find` is faster than `relation.find`).
* | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | given Related 2b5f5cdd7c1d95716de6a206b6d09ccbb006dc17. If `reflection.scope` isn't given, `reflection_scope` is always empty scope. It is unnecessary to merge it.
* | | | | | | Return `through_scope` only if the scope is not empty scopeRyuta Kamizono2017-09-181-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related 2b5f5cdd7c1d95716de6a206b6d09ccbb006dc17. If `through_scope` is empty scope, it is unnecessary to merge it. And also, comparing relations is a little expensive (will cause `build_arel`). It is enough to use `empty_scope?` to determine whether empty scope.
* | | | | | | Remove useless condition in `reset_association`Ryuta Kamizono2017-09-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `through_scope` is not empty scope if `options[:source_type]` is given.
* | | | | | | Merge pull request #30637 from ↵Ryuta Kamizono2017-09-181-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/add_round_bracket_in_5_1_release_notes Add missing round bracket in "Ruby on Rails 5.1 Release Notes" guide [ci skip]
| * | | | | | | Add missing round bracket in "Ruby on Rails 5.1 Release Notes" guidebogdanvlviv2017-09-171-1/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #30633 from yhirano55/add_mini_magick_to_app_generatorRyuta Kamizono2017-09-182-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add `mini_magick` to default `Gemfile` as comment
| * | | | | | | Add `mini_magick` to default `Gemfile` as commentYoshiyuki Hirano2017-09-172-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * If we want to transform image on ActiveStorage, we should bundle `mini_magick`. * I've added comment block to default `Gemfile` to be easier to install this.
* | | | | | | | Merge pull request #30632 from dixpac/fix_migration_rollback_docsRyuta Kamizono2017-09-181-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix docs describing rollback [ci skip]
| * | | | | | | | Fix docs describing rollback [ci skip]dixpac2017-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `rails db:migrate STEP = 2` will not rollback the migrations, instead `rails db:rollback STEP = 2` will do the rollback. * Also, rewritten `rails db:migrate VERSION` => `rails db:rollback VERSION` for consistency.
* | | | | | | | | Merge pull request #30630 from ydakuka/patch-1Ryuta Kamizono2017-09-171-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update plugins.md [ci skip]
| * | | | | | | | | Update plugins.md [ci skip]Yauheni Dakuka2017-09-171-1/+1
| | |/ / / / / / / | |/| | | | | | |