aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ci skip] Fix the with order and explain it.Kasper Timm Hansen2017-09-241-3/+8
|
* Merge pull request #30593 from BigChief45/guides/action-mailer-parameterizedKasper Timm Hansen2017-09-241-29/+48
|\ | | | | Update Action Mailer Basics [ci skip]
| * Update Action Mailer Basics [skip ci]Jaime Alvarez2017-09-241-29/+48
| |
* | Merge pull request #30668 from yhirano55/fix_api_guideRyuta Kamizono2017-09-241-1/+0
|\ \ | | | | | | Fix rails middleware list in api_app guide [ci skip]
| * | Fix rails middleware list in api_app guide [ci skip]Yoshiyuki Hirano2017-09-241-1/+0
| | | | | | | | | | | | * `MyApi::Application::Routes` is not middleware.
* | | Merge pull request #30689 from ↵Sean Griffin2017-09-231-2/+2
|\ \ \ | | | | | | | | | | | | | | | | yhirano55/fix_email_in_active_support_instrumentation Fix email in Active Support Instrumentation [ci skip]
| * | | Fix email in Active Support Instrumentation [ci skip]Yoshiyuki Hirano2017-09-241-2/+2
|/ / / | | | | | | | | | * `s/ddh/dhh/`
* | | Merge pull request #30688 from ↵Sean Griffin2017-09-232-1/+14
|\ \ \ | | | | | | | | | | | | | | | | y-yagi/make_bang_verion_work_with_inheritable_options Make bang version work with `InheritableOptions`
| * | | Make bang version work with `InheritableOptions`yuuji.yaginuma2017-09-232-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, bang version does not work with `InheritableOptions`. `InheritableOptions` treats the argument Hash as the default value. However, `Hash#fetch` does not use the default value when key is not found, so can not get the default value. So in bang version, should use `Hash#[]` instead of `Hash#fetch`.
* | | | Move integer-like primary key normalization to `new_column_definition`Ryuta Kamizono2017-09-236-38/+28
| | | | | | | | | | | | | | | | | | | | | | | | Currently the normalization only exists in `primary_key` shorthand. It should be moved to `new_column_definition` to also affect to `add_column` with primary key.
* | | | Adding legacy primary key should be compatibleRyuta Kamizono2017-09-232-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently implicit legacy primary key is compatible, but adding explicit legacy primary key is not compatible. It should also be fixed. Fixes #30664.
* | | | Merge pull request #30686 from metaskills/sqlserver-1as1fixSean Griffin2017-09-221-1/+1
|\ \ \ \ | | | | | | | | | | Ensure `1 AS one` for SQL Server with Calculations
| * | | | Ensure `1 AS one` for SQL Server with calculations.Ken Collins2017-09-221-1/+1
|/ / / /
* | | | Prevent extra `column_for` for `change_column_{default,null,comment}`Ryuta Kamizono2017-09-231-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `change_column_{default,null,comment}` in mysql2 adapter are passing `column.sql_type` as `type` to `change_column` to intend keeping previous type. But `column_for` requires extra query, so use passing `nil` to `type` explicitly in the internal for the purpose.
* | | | `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]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 02:40:59 +0000