aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Unify the internal source control .keep file nameKoichi ITO2017-08-242-0/+0
* 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
| |/ /
* | | Merge pull request #23425 from yui-knk/support_sti_automatically_inverseAkira Matsuda2017-08-223-2/+43
|\ \ \
| * | | Automatically guess the inverse associations for STIyui-knk2017-08-223-2/+43
|/ / /
* | | Merge pull request #30357 from ydakuka/missing-backquotesRyuta Kamizono2017-08-223-4/+4
|\ \ \
| * | | missing backquotes [ci skip]Yauheni Dakuka2017-08-223-4/+4
* | | | Merge pull request #30353 from yhirano55/use_https_instead_of_http_in_actionpackRyuta Kamizono2017-08-229-21/+21
|\ \ \ \
| * | | | Update links to use https link instead of http [ci skip]Yoshiyuki Hirano2017-08-229-21/+21
|/ / / /
* | | | Merge pull request #30354 from yhirano55/use_https_instead_of_http_in_activer...Ryuta Kamizono2017-08-2212-13/+13
|\ \ \ \
| * | | | Update links to use https instead of http [ci skip]Yoshiyuki Hirano2017-08-2212-13/+13
| | |/ / | |/| |
* | | | Merge pull request #30348 from koic/remove_frozen_string_literal_from_templatesGeorge Claghorn2017-08-2142-85/+0
|\ \ \ \
| * | | | Remove frozen_string_literal magic comment from templatesKoichi ITO2017-08-2242-85/+0
* | | | | Merge pull request #30355 from yhirano55/use_https_instead_of_http_in_actives...Ryuta Kamizono2017-08-225-6/+6
|\ \ \ \ \
| * | | | | Update links to use https instead of http [ci skip]Yoshiyuki Hirano2017-08-225-6/+6
|/ / / / /
* | | | | Merge pull request #30352 from yhirano55/update_licenses_linkRyuta Kamizono2017-08-2212-15/+14
|\ \ \ \ \
| * | | | | Update MIT licenses link [ci skip]Yoshiyuki Hirano2017-08-2212-15/+14
| | |/ / / | |/| | |
* | | | | Add frozen string literal pragmaGeorge Claghorn2017-08-211-0/+2
* | | | | Encode Content-Disposition filenames according to RFC 2231George Claghorn2017-08-216-4/+74
| |_|/ / |/| | |
* | | | Merge pull request #30349 from ydakuka/patch-1Ryuta Kamizono2017-08-221-4/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update debugging_rails_applications [ci skip]Yauheni Dakuka2017-08-211-4/+4
|/ / /
* | | Merge pull request #28912 from kaspth/getting-started-form-withKasper Timm Hansen2017-08-212-67/+100
|\ \ \ | |_|/ |/| |
| * | [ci skip] form_with in the getting started guide.Kasper Timm Hansen2017-08-212-67/+100
* | | Merge pull request #30346 from yhirano55/fix_broken_link_to_mysql_docs_in_dat...Ryuta Kamizono2017-08-222-2/+2
|\ \ \ | |_|/ |/| |
| * | Fix broken link to mysql docs in database.yml [ci skip]Yoshiyuki Hirano2017-08-222-2/+2
|/ /
* | Merge pull request #30345 from yhirano55/fix_link_contributing_guideEileen M. Uchitelle2017-08-211-7/+7
|\ \
| * | Fix link Contributing Ruby on Rails [ci skip]Yoshiyuki Hirano2017-08-211-7/+7
|/ /
* | Merge pull request #30344 from yhirano55/update_guide_contributing_ruby_on_railsप्रथमेश Sonpatki2017-08-211-1/+1
|\ \
| * | Update Contributing to Ruby on Rails guide [ci skip]Yoshiyuki Hirano2017-08-211-1/+1
|/ /
* | Merge pull request #30343 from yhirano55/update_generator_guideVipul A M2017-08-211-4/+8
|\ \
| * | Update generator guide [ci skip]Yoshiyuki Hirano2017-08-211-4/+8
* | | Prevent extra `SET time zone` in `configure_connection` (#28413)Ryuta Kamizono2017-08-212-6/+15
* | | Merge pull request #30341 from yhirano55/update_rails_on_rack_guideप्रथमेश Sonpatki2017-08-211-1/+1
|\ \ \ | |/ / |/| |
| * | Update Rails on Rack guide [ci skip]Yoshiyuki Hirano2017-08-211-1/+1
|/ /