aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | `index_name` should be quotedRyuta Kamizono2017-09-221-1/+1
| | | | |
* | | | | Return nil if table comment is blankRyuta Kamizono2017-09-222-2/+2
| | | | |
* | | | | Merge pull request #30677 from alecspopa/masterRyuta Kamizono2017-09-222-0/+32
|\ \ \ \ \ | | | | | | | | | | | | Implement change_table_comment and change_column_comment
| * | | | | Implement change_table_comment and change_column_comment for MySql AdapterAlecs Popa2017-09-222-0/+32
| | | | | |
* | | | | | Merge pull request #30683 from y-yagi/fix_30644Ryuta Kamizono2017-09-222-2/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Use `TOPLEVEL_BINDING` in rails runner command
| * | | | | Use `TOPLEVEL_BINDING` in rails runner commandyuuji.yaginuma2017-09-222-2/+14
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding to capture the local scope. This means that if a constant with same name as constant specified by the user exists in local scope, constant defined in local will use. This is different from what the user expects. Therefore, fixed to use top-level binding instead of local scope. Fixes #30644
* | | | | Merge pull request #24199 from meinac/fix_invert_add_indexRyuta Kamizono2017-09-213-2/+13
|\ \ \ \ \ | | | | | | | | | | | | Use algorithm while removing index with db:rollback
| * | | | | Use algorithm while removing index with db:rollbackMehmet Emin İNAÇ2017-09-213-2/+13
| |/ / / / | | | | | | | | | | | | | | | Closes #24190
* | | | | Merge pull request #30671 from y-yagi/fix_interpreted_as_argument_prefixRyuta Kamizono2017-09-211-5/+5
|\ \ \ \ \ | |/ / / / |/| | | | Fix "warning: `*' interpreted as argument prefix"
| * | | | Fix "warning: `*' interpreted as argument prefix"yuuji.yaginuma2017-09-211-5/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes following warning: ``` /home/travis/build/rails/rails/activerecord/test/cases/instrumentation_test.rb:11: warning: `*' interpreted as argument prefix /home/travis/build/rails/rails/activerecord/test/cases/instrumentation_test.rb:23: warning: `*' interpreted as argument prefix /home/travis/build/rails/rails/activerecord/test/cases/instrumentation_test.rb:35: warning: `*' interpreted as argument prefix /home/travis/build/rails/rails/activerecord/test/cases/instrumentation_test.rb:48: warning: `*' interpreted as argument prefix /home/travis/build/rails/rails/activerecord/test/cases/instrumentation_test.rb:61: warning: `*' interpreted as argument prefix ```
* | | | Merge pull request #30669 from yhirano55/update_link_in_asset_pipeline_guideRyuta Kamizono2017-09-211-1/+1
|\ \ \ \ | | | | | | | | | | Update link in The Asset Pipeline guide [ci skip]
| * | | | Update link in The Asset Pipeline guide [ci skip]Yoshiyuki Hirano2017-09-211-1/+1
| |/ / /
* | | | Merge pull request #30619 from ↵Eileen M. Uchitelle2017-09-203-4/+83
|\ \ \ \ | |/ / / |/| | | | | | | | | | | jagthedrummer/jeremy/instrumentation-payload-names Update payload names for `sql.active_record` instrumentation to be more descriptive.
| * | | Update payload names for `sql.active_record` to be more descriptive.Jeremy Green2017-09-203-4/+83
| | | | | | | | | | | | | | | | Fixes #30586.
* | | | Merge pull request #30548 from chumakoff/update_autosave_guidesEileen M. Uchitelle2017-09-201-4/+4
|\ \ \ \ | | | | | | | | | | Update Rails Guides about :autosave option
| * | | | Update Rails Guides about :autosave optionAnton Chumakov2017-09-201-4/+4
| | | | |
* | | | | Add missing word [ci skip]George Claghorn2017-09-201-1/+1
| | | | |
* | | | | Flesh out ActiveStorage::Filename docsGeorge Claghorn2017-09-201-6/+14
|/ / / /
* | | | Merge pull request #30624 from bogdanvlviv/deprecate_Module_reachableSean Griffin2017-09-205-52/+23
|\ \ \ \ | | | | | | | | | | Deprecate `Module#reachable?` method
| * | | | Remove mentions about `Module#reachable?` in "Active Support Core ↵bogdanvlviv2017-09-171-39/+0
| | | | | | | | | | | | | | | | | | | | Extensions" guide
| * | | | Remove redundant require_relative "module/anonymous" and "module/reachable"bogdanvlviv2017-09-171-3/+0
| | | | |
| * | | | Deprecate `Module#reachable?` methodbogdanvlviv2017-09-173-10/+23
| | | | |
* | | | | 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` macro
| * | | | | Add `with_attached_*` scope to `has_one_attached` macroYoshiyuki Hirano2017-09-192-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * For avoiding N+1 problem, added `with_attached_*` scope to `has_one_attached` macro.
* | | | | | Merge pull request #30616 from yhirano55/update_layouts_and_renderingEileen M. Uchitelle2017-09-201-17/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update Layouts and Rendering in Rails [ci skip]
| * | | | | | Update Layouts and Rendering in Rails [ci skip]Yoshiyuki Hirano2017-09-171-17/+19
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The example code on this page are similar to ones generated by scaffold generator, but some points are different. * Of course, it is no reason to be as same as scaffolding codes. But this is the guide for beginners, I thought it's better to be almost same as scaffolding codes.
* | | | | | Merge pull request #30623 from manojmj92/manojmj92-oo-key-patchJavan Makhmali2017-09-202-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | make documentation consistent with KeyError message
| * | | | | | 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 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]