Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | [ci skip] Fix a typo | yui-knk | 2017-08-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | We always plural form for `resources` method. | |||||
* | | | | Merge pull request #30424 from ↵ | George Claghorn | 2017-08-26 | 2 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | koic/fix_order_of_active_storage_disk_url_parameters Fix order of Active Storage DiskService URL parameters | |||||
| * | | | | Fix order of Active Storage DiskService URL parameters | Koichi ITO | 2017-08-26 | 2 | -2/+2 | |
|/ / / / | | | | | | | | | | | | | `content_type` parameter is before `disposition` parameter. | |||||
* | | | | Merge pull request #30422 from dansteele/patch-3 | Vipul A M | 2017-08-26 | 1 | -1/+4 | |
|\ \ \ \ | |_|/ / |/| | | | Correct wording and adding info [ci skip] | |||||
| * | | | Correct wording and adding info [ci skip] | Daniel Steele | 2017-08-26 | 1 | -1/+4 | |
|/ / / | | | | | | | I had to do some I was unsure what kind of caching it was performing, and had to do some Googling. Also improves the wording. | |||||
* | | | Fix random CI failure due to non-deterministic sorting order | Ryuta Kamizono | 2017-08-26 | 1 | -6/+6 | |
| | | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/268599781#L784 | |||||
* | | | Merge pull request #30418 from yhirano55/use_tt_in_doc_for_actionpack | Ryuta Kamizono | 2017-08-26 | 8 | -17/+17 | |
|\ \ \ | | | | | | | | | Use tt in doc for action_pack [ci skip] | |||||
| * | | | Use tt in doc for ActionPack [ci skip] | Yoshiyuki Hirano | 2017-08-26 | 8 | -17/+17 | |
| | | | | ||||||
* | | | | Merge pull request #30417 from ↵ | Ryuta Kamizono | 2017-08-26 | 2 | -1/+16 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | y-yagi/fix_cant_modify_forzen_string_error_in_display_image Fix `can't modify frozen String` error in `display_image` | |||||
| * | | | | Fix `can't modify frozen String` error in `display_image` | yuuji.yaginuma | 2017-08-26 | 2 | -1/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, `display_image` raises an error as follwing: ``` RuntimeError: can't modify frozen String rails/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb:72:in `display_image' rails/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb:40:in `block (2 levels) in <class:ScreenshotHelperTest>' ``` | |||||
* | | | | | Merge pull request #30416 from yhirano55/use_tt_in_doc_for_action_mailer | Ryuta Kamizono | 2017-08-26 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Use tt in doc for action_mailer [ci skip] | |||||
| * | | | | | Use tt in doc for action_mailer [ci skip] | Yoshiyuki Hirano | 2017-08-26 | 1 | -1/+1 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #30415 from yhirano55/use_typewriter_in_doc_for_action_cable | Ryuta Kamizono | 2017-08-26 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Use typewriter in doc for Action Cable [ci skip] | |||||
| * | | | | | Use typewriter in doc for Action Cable [ci skip] | Yoshiyuki Hirano | 2017-08-26 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #30403 from yhirano55/fix_broken_doc_for_active_record | Ryuta Kamizono | 2017-08-26 | 7 | -7/+7 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix broken doc for Active Record [ci skip] | |||||
| * | | | | | Fix broken doc for Active Record [ci skip] | Yoshiyuki Hirano | 2017-08-25 | 7 | -7/+7 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #30413 from yhirano55/enable_links_in_active_storage_docs | George Claghorn | 2017-08-25 | 2 | -2/+2 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Enable links in Active Storage docs [ci skip] | |||||
| * | | | | | | Enable links in Active Storage docs [ci skip] | Yoshiyuki Hirano | 2017-08-26 | 2 | -2/+2 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #30412 from ↵ | Richard Schneeman | 2017-08-25 | 3 | -3/+3 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | yhirano55/add_nodoc_for_active_record_attribute_methods Add :nodoc: for ActiveRecord::AttributeMethods [ci skip] | |||||
| * | | | | | Add :nodoc: for ActiveRecord::AttributeMethods [ci skip] | Yoshiyuki Hirano | 2017-08-26 | 3 | -3/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #30404 from yhirano55/fix_link_in_doc_for_active_storage | Robin Dupret | 2017-08-25 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix link in doc for active storage [ci skip] | |||||
| * | | | | | Fix link in doc for active storage [ci skip] | Yoshiyuki Hirano | 2017-08-25 | 1 | -1/+1 | |
| |/ / / / | ||||||
* / / / / | Should work inverse association when eager loading | Ryuta Kamizono | 2017-08-25 | 4 | -15/+24 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This regression was caused by caa178c1. The block for `set_inverse_instance` should also be passed to join dependency. Fixes #30402. | |||||
* | | | | Merge pull request #30401 from yhirano55/add_paths_to_docs_for_active_storage | Ryuta Kamizono | 2017-08-25 | 1 | -0/+1 | |
|\ \ \ \ | |/ / / |/| | | | Add paths to docs for Active Storage | |||||
| * | | | Add paths to docs for Active Storage | Yoshiyuki Hirano | 2017-08-25 | 1 | -0/+1 | |
|/ / / | ||||||
* | | | Merge pull request #30398 from yahonda/seed52024 | Ryuta Kamizono | 2017-08-25 | 1 | -0/+4 | |
|\ \ \ | | | | | | | | | Address `test_after_save_callback_with_autosave` failure | |||||
| * | | | Address `test_after_save_callback_with_autosave` failure | Yasuo Honda | 2017-08-24 | 1 | -0/+4 | |
|/ / / | | | | | | | | | | | | | | | | | | | when other `AutomaticInverseFindingTests` load `:comments` fixture but does not load `:posts`. Refer #30385 for similar issue | |||||
* | | | Widen blob size column | George Claghorn | 2017-08-24 | 1 | -1/+1 | |
| | | | ||||||
* | | | Remove unused returning value `stream` | Ryuta Kamizono | 2017-08-24 | 1 | -2/+0 | |
| | | | ||||||
* | | | Merge pull request #30337 from kamipo/refactor_schema_dumper | Ryuta Kamizono | 2017-08-24 | 15 | -56/+54 | |
|\ \ \ | | | | | | | | | Refactor `SchemaDumper` to make it possible to adapter specific customization | |||||
| * | | | Refactor `SchemaDumper` to make it possible to adapter specific customization | Ryuta Kamizono | 2017-08-22 | 13 | -38/+51 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `SchemaDumper` is only customizable for column options. But 3rd party connection adapters (oracle-enhanced etc) need to customizable for table or index dumping also. To make it possible, I introduced adapter specific `SchemaDumper` classes for that. | |||||
| * | | | Remove deprecated `#migration_keys` | Ryuta Kamizono | 2017-08-22 | 5 | -19/+4 | |
| | | | | ||||||
* | | | | Remove unnecessary fixture loading | Ryuta Kamizono | 2017-08-24 | 1 | -5/+1 | |
| | | | | ||||||
* | | | | Merge pull request #30394 from ydakuka/fixing-indentation | Ryuta Kamizono | 2017-08-24 | 5 | -11/+11 | |
|\ \ \ \ | | | | | | | | | | | Fix indentation [ci skip] | |||||
| * | | | | Fix indentation [ci skip] | Yauheni Dakuka | 2017-08-24 | 5 | -11/+11 | |
| | | | | | ||||||
* | | | | | Merge pull request #30393 from ydakuka/patch-1 | Ryuta Kamizono | 2017-08-24 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Update active_support_core_extensions.md [ci skip] | |||||
| * | | | | | Update active_support_core_extensions.md [ci skip] | Yauheni Dakuka | 2017-08-24 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #30390 from bradleybuda/master | Ryuta Kamizono | 2017-08-24 | 1 | -3/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | Update azure-core to 0.1.11 to fix rails-dev-box | |||||
| * | | | | | Update azure-core to 0.1.11 to fix rails-dev-box | Bradley Buda | 2017-08-23 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rails-dev-box was failing to install gems with a filesystem permission error. The issue was introduced when azure-core was bumped from 0.1.9 to 0.1.10 in d2f493c. azure-core has fixed the build problem [1] and released a new version, 0.1.11 with the fix. This change is just to run `bundle update azure-core` to pick up that fix. [1]: https://github.com/Azure/azure-ruby-asm-core/commit/536c3fc21cc48c292959cc10a9e5551e165aa0ed | |||||
* | | | | | | Merge pull request #30376 from willnet/belongs-to-dependent-option | Ryuta Kamizono | 2017-08-24 | 1 | -6/+5 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | [ci skip]Revert commits changing wrong place | |||||
| * | | | | | [ci skip]Revert commits changing wrong place | willnet | 2017-08-24 | 1 | -6/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 5147ab121d628f29451c654a8c312d5a3f491ffb and 391043ab04007bfd4c4c4c8e8d3308c1eae60175. These commits looked to intend to change documents of has_many dependent options, but actually changed documents of belongs_to dependent options. | |||||
* | | | | | | Merge pull request #30383 from y-yagi/followup_of_30213 | Eileen M. Uchitelle | 2017-08-23 | 2 | -7/+7 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove `alt` text from `image_tag` example [ci skip] | |||||
| * | | | | | | Remove `alt` text from `image_tag` example [ci skip] | yuuji.yaginuma | 2017-08-24 | 2 | -7/+7 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Follow up of #30213 | |||||
* | | | | | | Merge pull request #30382 from yhirano55/fix_broken_link_for_java_xml | Rafael França | 2017-08-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix broken link for Java xml [ci skip] | |||||
| * | | | | | | Fix broken link for Java xml [ci skip] | Yoshiyuki Hirano | 2017-08-24 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #30366 from MrOutis/action-cable-env-var | Rafael França | 2017-08-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use REDIS_URL var for Action Cable config template | |||||
| * | | | | | | | Use REDIS_URL var for Action Cable config template | Mr. Outis | 2017-08-22 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Make sure image_alt is deprecated | Rafael Mendonça França | 2017-08-23 | 1 | -5/+15 | |
| | | | | | | | | ||||||
* | | | | | | | | Remove alt generation from image_submit_tag | Rafael Mendonça França | 2017-08-23 | 2 | -7/+7 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #30213 from ckundo/ccundiff-alt-text-default | Rafael Mendonça França | 2017-08-23 | 9 | -40/+42 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | Do not generate default alt text for images |