rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #30360 from gcourtemanche/transaction_timedout	Rafael França	2017-08-22	3	-0/+14
\|\
\| *	Add TransactionTimeout for MySQL error code 1205	Gabriel Courtemanche	2017-08-22	3	-0/+14
* \|	Merge pull request #30371 from yhirano55/fix_spaces_in_the_comment_block	Richard Schneeman	2017-08-22	1	-1/+1
\|\ \
\| * \|	Fix spaces in the comment block [ci skip]	Yoshiyuki Hirano	2017-08-23	1	-1/+1
* \| \|	Merge pull request #30369 from dustMason/security-guide-grammar-fix	George Claghorn	2017-08-22	1	-1/+1
\|\ \ \
\| * \| \|	Grammar fix	Jordan Sitkin	2017-08-22	1	-1/+1
\|/ / /
* \| \|	Merge pull request #30363 from ibrahimab/patch-1	Ryuta Kamizono	2017-08-23	1	-1/+1
\|\ \ \
\| * \| \|	Fixing nginx configuration added missing semicolon	Ibrahim	2017-08-22	1	-1/+1
\|/ / /
* \| \|	Merge pull request #30336 from bogdanvlviv/use_version_5_2_for_activestorage	Rafael França	2017-08-22	2	-2/+2
\|\ \ \
\| * \| \|	Use 5.2 version of ActiveRecord::Migration for Active Storage	bogdanvlviv	2017-08-22	2	-2/+2
\|/ / /
* \| \|	Merge pull request #30356 from bogdanvlviv/remove-frozen_string_literal-from-...	Kasper Timm Hansen	2017-08-22	2	-2/+1
\|\ \ \
\| * \| \|	Remove frozen_string_literal comment from activestorage's migration	bogdanvlviv	2017-08-22	2	-2/+1
\| \|/ /
* \| \|	Merge pull request #23425 from yui-knk/support_sti_automatically_inverse	Akira Matsuda	2017-08-22	3	-2/+43
\|\ \ \
\| * \| \|	Automatically guess the inverse associations for STI	yui-knk	2017-08-22	3	-2/+43
\|/ / /
* \| \|	Merge pull request #30357 from ydakuka/missing-backquotes	Ryuta Kamizono	2017-08-22	3	-4/+4
\|\ \ \
\| * \| \|	missing backquotes [ci skip]	Yauheni Dakuka	2017-08-22	3	-4/+4
* \| \| \|	Merge pull request #30353 from yhirano55/use_https_instead_of_http_in_actionpack	Ryuta Kamizono	2017-08-22	9	-21/+21
\|\ \ \ \
\| * \| \| \|	Update links to use https link instead of http [ci skip]	Yoshiyuki Hirano	2017-08-22	9	-21/+21
\|/ / / /
* \| \| \|	Merge pull request #30354 from yhirano55/use_https_instead_of_http_in_activer...	Ryuta Kamizono	2017-08-22	12	-13/+13
\|\ \ \ \
\| * \| \| \|	Update links to use https instead of http [ci skip]	Yoshiyuki Hirano	2017-08-22	12	-13/+13
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #30348 from koic/remove_frozen_string_literal_from_templates	George Claghorn	2017-08-21	42	-85/+0
\|\ \ \ \
\| * \| \| \|	Remove frozen_string_literal magic comment from templates	Koichi ITO	2017-08-22	42	-85/+0
* \| \| \| \|	Merge pull request #30355 from yhirano55/use_https_instead_of_http_in_actives...	Ryuta Kamizono	2017-08-22	5	-6/+6
\|\ \ \ \ \
\| * \| \| \| \|	Update links to use https instead of http [ci skip]	Yoshiyuki Hirano	2017-08-22	5	-6/+6
\|/ / / / /
* \| \| \| \|	Merge pull request #30352 from yhirano55/update_licenses_link	Ryuta Kamizono	2017-08-22	12	-15/+14
\|\ \ \ \ \
\| * \| \| \| \|	Update MIT licenses link [ci skip]	Yoshiyuki Hirano	2017-08-22	12	-15/+14
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Add frozen string literal pragma	George Claghorn	2017-08-21	1	-0/+2
* \| \| \| \|	Encode Content-Disposition filenames according to RFC 2231	George Claghorn	2017-08-21	6	-4/+74
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge pull request #30349 from ydakuka/patch-1	Ryuta Kamizono	2017-08-22	1	-4/+4
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Update debugging_rails_applications [ci skip]	Yauheni Dakuka	2017-08-21	1	-4/+4
\|/ / /
* \| \|	Merge pull request #28912 from kaspth/getting-started-form-with	Kasper Timm Hansen	2017-08-21	2	-67/+100
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	[ci skip] form_with in the getting started guide.	Kasper Timm Hansen	2017-08-21	2	-67/+100
* \| \|	Merge pull request #30346 from yhirano55/fix_broken_link_to_mysql_docs_in_dat...	Ryuta Kamizono	2017-08-22	2	-2/+2
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Fix broken link to mysql docs in database.yml [ci skip]	Yoshiyuki Hirano	2017-08-22	2	-2/+2
\|/ /
* \|	Merge pull request #30345 from yhirano55/fix_link_contributing_guide	Eileen M. Uchitelle	2017-08-21	1	-7/+7
\|\ \
\| * \|	Fix link Contributing Ruby on Rails [ci skip]	Yoshiyuki Hirano	2017-08-21	1	-7/+7
\|/ /
* \|	Merge pull request #30344 from yhirano55/update_guide_contributing_ruby_on_rails	प्रथमेश Sonpatki	2017-08-21	1	-1/+1
\|\ \
\| * \|	Update Contributing to Ruby on Rails guide [ci skip]	Yoshiyuki Hirano	2017-08-21	1	-1/+1
\|/ /
* \|	Merge pull request #30343 from yhirano55/update_generator_guide	Vipul A M	2017-08-21	1	-4/+8
\|\ \
\| * \|	Update generator guide [ci skip]	Yoshiyuki Hirano	2017-08-21	1	-4/+8
* \| \|	Prevent extra `SET time zone` in `configure_connection` (#28413)	Ryuta Kamizono	2017-08-21	2	-6/+15
* \| \|	Merge pull request #30341 from yhirano55/update_rails_on_rack_guide	प्रथमेश Sonpatki	2017-08-21	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Update Rails on Rack guide [ci skip]	Yoshiyuki Hirano	2017-08-21	1	-1/+1
\|/ /
* \|	Merge pull request #30332 from y-yagi/fix_29306	George Claghorn	2017-08-20	7	-17/+44
\|\ \
\| * \|	Make `restart` and `dev:cache` tasks work when customizing pid file path	yuuji.yaginuma	2017-08-21	7	-17/+44
* \| \|	Merge pull request #30340 from yhirano55/update_autoloading_and_reloading_con...	Ryuta Kamizono	2017-08-21	1	-1/+10
\|\ \ \
\| * \| \|	Update result of autoload_paths in Autoloading and Reloading Constants guide ...	Yoshiyuki Hirano	2017-08-21	1	-1/+10
\|/ / /
* \| \|	Update regex	George Claghorn	2017-08-20	1	-1/+1
* \| \|	Fix tests	George Claghorn	2017-08-20	4	-4/+4
* \| \|	Fix syntax error	George Claghorn	2017-08-20	1	-1/+1