Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #30677 from alecspopa/master | Ryuta Kamizono | 2017-09-22 | 2 | -0/+32 | |
|\ \ \ \ \ | | | | | | | | | | | | | Implement change_table_comment and change_column_comment | |||||
| * | | | | | Implement change_table_comment and change_column_comment for MySql Adapter | Alecs Popa | 2017-09-22 | 2 | -0/+32 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #30683 from y-yagi/fix_30644 | Ryuta Kamizono | 2017-09-22 | 2 | -2/+14 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Use `TOPLEVEL_BINDING` in rails runner command | |||||
| * | | | | | Use `TOPLEVEL_BINDING` in rails runner command | yuuji.yaginuma | 2017-09-22 | 2 | -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_index | Ryuta Kamizono | 2017-09-21 | 3 | -2/+13 | |
|\ \ \ \ \ | | | | | | | | | | | | | Use algorithm while removing index with db:rollback | |||||
| * | | | | | Use algorithm while removing index with db:rollback | Mehmet Emin İNAÇ | 2017-09-21 | 3 | -2/+13 | |
| |/ / / / | | | | | | | | | | | | | | | | Closes #24190 | |||||
* | | | | | Merge pull request #30671 from y-yagi/fix_interpreted_as_argument_prefix | Ryuta Kamizono | 2017-09-21 | 1 | -5/+5 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix "warning: `*' interpreted as argument prefix" | |||||
| * | | | | Fix "warning: `*' interpreted as argument prefix" | yuuji.yaginuma | 2017-09-21 | 1 | -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_guide | Ryuta Kamizono | 2017-09-21 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Update link in The Asset Pipeline guide [ci skip] | |||||
| * | | | | Update link in The Asset Pipeline guide [ci skip] | Yoshiyuki Hirano | 2017-09-21 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #30619 from ↵ | Eileen M. Uchitelle | 2017-09-20 | 3 | -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 Green | 2017-09-20 | 3 | -4/+83 | |
| | | | | | | | | | | | | | | | | Fixes #30586. | |||||
* | | | | Merge pull request #30548 from chumakoff/update_autosave_guides | Eileen M. Uchitelle | 2017-09-20 | 1 | -4/+4 | |
|\ \ \ \ | | | | | | | | | | | Update Rails Guides about :autosave option | |||||
| * | | | | Update Rails Guides about :autosave option | Anton Chumakov | 2017-09-20 | 1 | -4/+4 | |
| | | | | | ||||||
* | | | | | Add missing word [ci skip] | George Claghorn | 2017-09-20 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Flesh out ActiveStorage::Filename docs | George Claghorn | 2017-09-20 | 1 | -6/+14 | |
|/ / / / | ||||||
* | | | | Merge pull request #30624 from bogdanvlviv/deprecate_Module_reachable | Sean Griffin | 2017-09-20 | 5 | -52/+23 | |
|\ \ \ \ | | | | | | | | | | | Deprecate `Module#reachable?` method | |||||
| * | | | | Remove mentions about `Module#reachable?` in "Active Support Core ↵ | bogdanvlviv | 2017-09-17 | 1 | -39/+0 | |
| | | | | | | | | | | | | | | | | | | | | Extensions" guide | |||||
| * | | | | Remove redundant require_relative "module/anonymous" and "module/reachable" | bogdanvlviv | 2017-09-17 | 1 | -3/+0 | |
| | | | | | ||||||
| * | | | | Deprecate `Module#reachable?` method | bogdanvlviv | 2017-09-17 | 3 | -10/+23 | |
| | | | | | ||||||
* | | | | | Merge pull request #30629 from yhirano55/add_scope_to_has_one_attached_macro | Eileen M. Uchitelle | 2017-09-20 | 2 | -0/+19 | |
|\ \ \ \ \ | | | | | | | | | | | | | Add `with_attached_*` scope to `has_one_attached` macro | |||||
| * | | | | | Add `with_attached_*` scope to `has_one_attached` macro | Yoshiyuki Hirano | 2017-09-19 | 2 | -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_rendering | Eileen M. Uchitelle | 2017-09-20 | 1 | -17/+19 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update Layouts and Rendering in Rails [ci skip] | |||||
| * | | | | | | Update Layouts and Rendering in Rails [ci skip] | Yoshiyuki Hirano | 2017-09-17 | 1 | -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-patch | Javan Makhmali | 2017-09-20 | 2 | -3/+3 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | make documentation consistent with KeyError message | |||||
| * | | | | | | Fix error message documentation | Manoj M J | 2017-09-20 | 2 | -3/+3 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #30657 from yhirano55/fix_restful_wording | Ryuta Kamizono | 2017-09-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use RESTful instead of restful | |||||
| * | | | | | | Use RESTful instead of restful | Yoshiyuki Hirano | 2017-09-20 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #30655 from kuzukuzu/fix_create_join_table_compatibility | Ryuta Kamizono | 2017-09-20 | 2 | -0/+45 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | make create_join_table compatible. | |||||
| * | | | | | | | make create_join_table compatible. | Yuki Masutomi | 2017-09-20 | 2 | -0/+45 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #30659 from y-yagi/follow_up_of_30650 | Ryuta Kamizono | 2017-09-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use credentials in `storage.yml` template | |||||
| * | | | | | | | Use credentials in `storage.yml` template | yuuji.yaginuma | 2017-09-20 | 1 | -1/+1 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Follow up of #30650 | |||||
* | | | | | | | Use credentials, not secrets, for Active Storage (#30650) | Claudio B | 2017-09-19 | 3 | -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_doc | Ryuta Kamizono | 2017-09-20 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add :comment option for add_column [ci skip] | |||||
| * | | | | | | | Add :comment option for add_column [ci skip] | Yoshiyuki Kinjo | 2017-09-20 | 1 | -0/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #30648 from ydakuka/patch-1 | Javan Makhmali | 2017-09-19 | 3 | -4/+4 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update action_controller_overview.md [ci skip] | |||||
| * | | | | | | | | Update action_controller_overview.md [ci skip] | Yauheni Dakuka | 2017-09-19 | 3 | -4/+4 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #30653 from y-yagi/remove_unsued_digits_and_rounded_number | Ryuta Kamizono | 2017-09-19 | 1 | -12/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Remove unused `NumberToRoundedConverter#digits_and_rounded_number` | |||||
| * | | | | | | | | Remove unused `NumberToRoundedConverter#digits_and_rounded_number` | yuuji.yaginuma | 2017-09-19 | 1 | -12/+0 | |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | `digits_and_rounded_number` is unused since #26628 | |||||
* | | | | | | | | Merge pull request #30638 from twalpole/capybara_server | Eileen M. Uchitelle | 2017-09-18 | 6 | -20/+11 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Use the default Capybara registered puma server configuration | |||||
| * | | | | | | | | Use the default Capybara registered puma server configuration | Thomas Walpole | 2017-09-18 | 6 | -20/+11 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #30645 from ↵ | Ryuta Kamizono | 2017-09-18 | 1 | -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 Hirano | 2017-09-18 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #30643 from ↵ | Ryuta Kamizono | 2017-09-18 | 1 | -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 Cahill | 2017-09-18 | 1 | -0/+19 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #30642 from ydakuka/quotes | Ryuta Kamizono | 2017-09-18 | 3 | -7/+7 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix quotes [ci skip] | |||||
| * | | | | | | | Fix quotes [ci skip] | Yauheni Dakuka | 2017-09-18 | 3 | -7/+7 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #30641 from ydakuka/js-upcase | Ryuta Kamizono | 2017-09-18 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Upcase js [ci skip] | |||||
| * | | | | | | | Upcase js [ci skip] | Yauheni Dakuka | 2017-09-18 | 1 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #30640 from ydakuka/patch-1 | Ryuta Kamizono | 2017-09-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove "the" [ci skip] |