aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use tt in doc for ActionPack [ci skip]Yoshiyuki Hirano2017-08-268-17/+17
* 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]Yoshiyuki Hirano2017-08-251-1/+1
* | Should work inverse association when eager loadingRyuta Kamizono2017-08-254-15/+24
|/
* Merge pull request #30401 from yhirano55/add_paths_to_docs_for_active_storageRyuta Kamizono2017-08-251-0/+1
|\
| * 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` failureYasuo Honda2017-08-241-0/+4
|/
* 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 customizationRyuta Kamizono2017-08-2213-38/+51
| * 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]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]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-boxBradley Buda2017-08-231-3/+4
* | | | Merge pull request #30376 from willnet/belongs-to-dependent-optionRyuta Kamizono2017-08-241-6/+5
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip]Revert commits changing wrong placewillnet2017-08-241-6/+5
* | | | 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]yuuji.yaginuma2017-08-242-7/+7
|/ / / /
* | | | 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]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 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 in image tagsCameron Cundiff2017-08-179-40/+42
* | | | | | Merge pull request #30365 from yahonda/require_post_before_commentRyuta Kamizono2017-08-231-0/+3
|\ \ \ \ \ \
| * | | | | | `counter_cache` requires association class before `attr_readonly`Yasuo Honda2017-08-231-0/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #30373 from yhirano55/use_https_instead_of_http_in_rails_g...Ryuta Kamizono2017-08-2318-27/+27
|\ \ \ \ \ \
| * | | | | | Use https instead of http in guide [ci skip]Yoshiyuki Hirano2017-08-2318-27/+27
* | | | | | | Merge pull request #28991 from yahonda/load_authors_and_author_addressesRyuta Kamizono2017-08-234-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Load both `:authors` and `:author_addresses` to keep data integrityYasuo Honda2017-08-224-4/+4
| |/ / / / /
* | | | | | Merge pull request #30360 from gcourtemanche/transaction_timedoutRafael França2017-08-223-0/+14
|\ \ \ \ \ \
| * | | | | | Add TransactionTimeout for MySQL error code 1205Gabriel Courtemanche2017-08-223-0/+14
* | | | | | | Merge pull request #30371 from yhirano55/fix_spaces_in_the_comment_blockRichard Schneeman2017-08-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix spaces in the comment block [ci skip]Yoshiyuki Hirano2017-08-231-1/+1
* | | | | | | | Merge pull request #30369 from dustMason/security-guide-grammar-fixGeorge Claghorn2017-08-221-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Grammar fixJordan Sitkin2017-08-221-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #30363 from ibrahimab/patch-1Ryuta Kamizono2017-08-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixing nginx configuration added missing semicolonIbrahim2017-08-221-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #30336 from bogdanvlviv/use_version_5_2_for_activestorageRafael França2017-08-222-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Use 5.2 version of ActiveRecord::Migration for Active Storagebogdanvlviv2017-08-222-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #30356 from bogdanvlviv/remove-frozen_string_literal-from-...Kasper Timm Hansen2017-08-222-2/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Remove frozen_string_literal comment from activestorage's migrationbogdanvlviv2017-08-222-2/+1
| |/ / / / /