aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | [ci skip] Fix a typoyui-knk2017-08-181-1/+1
| | | | | | | | | | | | | | | | We always plural form for `resources` method.
* | | | Merge pull request #30424 from ↵George Claghorn2017-08-262-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 parametersKoichi ITO2017-08-262-2/+2
|/ / / / | | | | | | | | | | | | `content_type` parameter is before `disposition` parameter.
* | | | Merge pull request #30422 from dansteele/patch-3Vipul A M2017-08-261-1/+4
|\ \ \ \ | |_|/ / |/| | | Correct wording and adding info [ci skip]
| * | | Correct wording and adding info [ci skip]Daniel Steele2017-08-261-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 orderRyuta Kamizono2017-08-261-6/+6
| | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/268599781#L784
* | | Merge pull request #30418 from yhirano55/use_tt_in_doc_for_actionpackRyuta Kamizono2017-08-268-17/+17
|\ \ \ | | | | | | | | Use tt in doc for action_pack [ci skip]
| * | | Use tt in doc for ActionPack [ci skip]Yoshiyuki Hirano2017-08-268-17/+17
| | | |
* | | | Merge pull request #30417 from ↵Ryuta Kamizono2017-08-262-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.yaginuma2017-08-262-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_mailerRyuta Kamizono2017-08-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use tt in doc for action_mailer [ci skip]
| * | | | | Use tt in doc for action_mailer [ci skip]Yoshiyuki Hirano2017-08-261-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #30415 from yhirano55/use_typewriter_in_doc_for_action_cableRyuta Kamizono2017-08-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use typewriter in doc for Action Cable [ci skip]
| * | | | | Use typewriter in doc for Action Cable [ci skip]Yoshiyuki Hirano2017-08-261-1/+1
| |/ / / /
* | | | | Merge pull request #30403 from yhirano55/fix_broken_doc_for_active_recordRyuta Kamizono2017-08-267-7/+7
|\ \ \ \ \ | | | | | | | | | | | | Fix broken doc for Active Record [ci skip]
| * | | | | Fix broken doc for Active Record [ci skip]Yoshiyuki Hirano2017-08-257-7/+7
| | | | | |
* | | | | | Merge pull request #30413 from yhirano55/enable_links_in_active_storage_docsGeorge Claghorn2017-08-252-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Enable links in Active Storage docs [ci skip]
| * | | | | | Enable links in Active Storage docs [ci skip]Yoshiyuki Hirano2017-08-262-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #30412 from ↵Richard Schneeman2017-08-253-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 Hirano2017-08-263-3/+3
|/ / / / /
* | | | | Merge pull request #30404 from yhirano55/fix_link_in_doc_for_active_storageRobin Dupret2017-08-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix link in doc for active storage [ci skip]
| * | | | | Fix link in doc for active storage [ci skip]Yoshiyuki Hirano2017-08-251-1/+1
| |/ / / /
* / / / / Should work inverse association when eager loadingRyuta Kamizono2017-08-254-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_storageRyuta Kamizono2017-08-251-0/+1
|\ \ \ \ | |/ / / |/| | | Add paths to docs for Active Storage
| * | | Add paths to docs for Active StorageYoshiyuki Hirano2017-08-251-0/+1
|/ / /
* | | Merge pull request #30398 from yahonda/seed52024Ryuta Kamizono2017-08-251-0/+4
|\ \ \ | | | | | | | | Address `test_after_save_callback_with_autosave` failure
| * | | Address `test_after_save_callback_with_autosave` failureYasuo Honda2017-08-241-0/+4
|/ / / | | | | | | | | | | | | | | | | | | when other `AutomaticInverseFindingTests` load `:comments` fixture but does not load `:posts`. Refer #30385 for similar issue
* | | Widen blob size columnGeorge Claghorn2017-08-241-1/+1
| | |
* | | Remove unused returning value `stream`Ryuta Kamizono2017-08-241-2/+0
| | |
* | | Merge pull request #30337 from kamipo/refactor_schema_dumperRyuta Kamizono2017-08-2415-56/+54
|\ \ \ | | | | | | | | Refactor `SchemaDumper` to make it possible to adapter specific customization
| * | | Refactor `SchemaDumper` to make it possible to adapter specific customizationRyuta Kamizono2017-08-2213-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 Kamizono2017-08-225-19/+4
| | | |
* | | | Remove unnecessary fixture loadingRyuta Kamizono2017-08-241-5/+1
| | | |
* | | | Merge pull request #30394 from ydakuka/fixing-indentationRyuta Kamizono2017-08-245-11/+11
|\ \ \ \ | | | | | | | | | | Fix indentation [ci skip]
| * | | | Fix indentation [ci skip]Yauheni Dakuka2017-08-245-11/+11
| | | | |
* | | | | Merge pull request #30393 from ydakuka/patch-1Ryuta Kamizono2017-08-241-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Update active_support_core_extensions.md [ci skip]
| * | | | | Update active_support_core_extensions.md [ci skip]Yauheni Dakuka2017-08-241-2/+2
|/ / / / /
* | | | | Merge pull request #30390 from bradleybuda/masterRyuta Kamizono2017-08-241-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-boxBradley Buda2017-08-231-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-optionRyuta Kamizono2017-08-241-6/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [ci skip]Revert commits changing wrong place
| * | | | | [ci skip]Revert commits changing wrong placewillnet2017-08-241-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_30213Eileen M. Uchitelle2017-08-232-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove `alt` text from `image_tag` example [ci skip]
| * | | | | | Remove `alt` text from `image_tag` example [ci skip]yuuji.yaginuma2017-08-242-7/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | Follow up of #30213
* | | | | | Merge pull request #30382 from yhirano55/fix_broken_link_for_java_xmlRafael França2017-08-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix broken link for Java xml [ci skip]
| * | | | | | Fix broken link for Java xml [ci skip]Yoshiyuki Hirano2017-08-241-1/+1
| | | | | | |
* | | | | | | Merge pull request #30366 from MrOutis/action-cable-env-varRafael França2017-08-231-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use REDIS_URL var for Action Cable config template
| * | | | | | | Use REDIS_URL var for Action Cable config templateMr. Outis2017-08-221-1/+1
| | | | | | | |
* | | | | | | | Make sure image_alt is deprecatedRafael Mendonça França2017-08-231-5/+15
| | | | | | | |
* | | | | | | | Remove alt generation from image_submit_tagRafael Mendonça França2017-08-232-7/+7
| | | | | | | |
* | | | | | | | Merge pull request #30213 from ckundo/ccundiff-alt-text-defaultRafael Mendonça França2017-08-239-40/+42
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | Do not generate default alt text for images