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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix inheritance object creation from relation	Ryuta Kamizono	2017-12-13	3	-12/+60
*	Merge pull request #31425 from chiastolite/optimize_foregin_keys_query	Ryuta Kamizono	2017-12-13	1	-2/+3
\|\
\| *	Optimizing information_schema query for `foreign_keys`	Hiroyuki Morita	2017-12-13	1	-2/+3
* \|	Merge pull request #31423 from bogdanvlviv/fix-protected_environments-with-sy...	Ryuta Kamizono	2017-12-13	4	-16/+51
\|\ \ \| \|/ \|/\|
\| *	Update 'Configuring Rails Applications' guide	bogdanvlviv	2017-12-12	1	-0/+4
\| *	Convert protected_environments to an array of strings	bogdanvlviv	2017-12-12	3	-16/+47
\|/
*	Make `sanitize_sql_` methods public	yuuji.yaginuma	2017-12-13	5	-152/+151
*	Merge pull request #31405 from bogdanvlviv/fix-conflicts-counter_cache-with-t...	Rafael França	2017-12-12	6	-8/+128
\|\
\| *	Fix conflicts `counter_cache` with `touch: true` by optimistic locking.	bogdanvlviv	2017-12-12	6	-8/+128
* \|	Merge pull request #31421 from tcopeland/trivial_typo	Rafael França	2017-12-12	1	-1/+1
\|\ \
\| * \|	Fix doc typo [ci skip]	Tom Copeland	2017-12-12	1	-1/+1
\|/ /
* \|	Merge pull request #31403 from Edouard-chin/fix-quoted-columnname	Rafael França	2017-12-12	2	-1/+9
\|\ \
\| * \|	Quote colum_names when building select:	Edouard CHIN	2017-12-11	2	-1/+9
* \| \|	Merge pull request #31418 from yahonda/revert_31339_to_address_31369	Eileen M. Uchitelle	2017-12-12	1	-1/+4
\|\ \ \
\| * \| \|	Revert "only install ffmpeg and mupdf on activestorage builds"	Yasuo Honda	2017-12-12	1	-1/+4
* \| \| \|	Merge pull request #31416 from meinac/minor_fix_on_active_support_changelog	Ryuta Kamizono	2017-12-12	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	[ci skip] Fix Active Support Changelog about :race_condition_ttl	Mehmet Emin INAC	2017-12-12	1	-1/+1
\|/ / /
* \| \|	Merge pull request #31414 from fatkodima/ignore_tables-comment	Ryuta Kamizono	2017-12-12	1	-1/+1
\|\ \ \
\| * \| \|	Remove stale comment about `ActiveRecord::SchemaDumper.ignore_tables` [skip ci]	fatkodima	2017-12-12	1	-1/+1
\|/ / /
* \| \|	Enable `Layout/SpaceBeforeComma` rubocop rule, and fixed more	Ryuta Kamizono	2017-12-12	24	-43/+46
* \| \|	Merge pull request #31411 from eugeneius/time_helpers_redefine_method	Ryuta Kamizono	2017-12-12	1	-1/+2
\|\ \ \
\| * \| \|	Prevent race condition when resetting time stubs	Eugene Kenny	2017-12-12	1	-1/+2
* \| \| \|	Merge pull request #31410 from swrobel/patch-3	Ryuta Kamizono	2017-12-12	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix secrets command deprecation message	Stefan Wrobel	2017-12-11	1	-1/+1
* \| \| \|	Merge pull request #31402 from yhirano55/update_routing_guide_for_direct_method	Ryuta Kamizono	2017-12-12	1	-0/+43
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	[ci skip] Update routing guide for Direct	Yoshiyuki Hirano	2017-12-12	1	-0/+43
* \| \| \|	Fix optimizing GIF variants using mogrify's -layers option	George Claghorn	2017-12-11	1	-5/+7
* \| \| \|	Revert "Invoke mogrify once when transforming an image"	George Claghorn	2017-12-11	1	-8/+6
* \| \| \|	Merge pull request #31407 from Edouard-chin/remove-create-fixtures-helper	Rafael França	2017-12-11	1	-4/+0
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	`create_fixtures` doesn't work since at least a94220b66c9e4890007f66b092b25f8...	Edouard CHIN	2017-12-11	1	-4/+0
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #31399 from yhirano55/return_nil_if_raise_http_error	George Claghorn	2017-12-11	1	-1/+1
\|\ \ \
\| * \| \|	Return `nil` instead of `false` if raise `Azure::Core::Http::HTTPError`	Yoshiyuki Hirano	2017-12-12	1	-1/+1
* \| \| \|	Merge pull request #31401 from yhirano55/update_instrumentation_guide_for_act...	George Claghorn	2017-12-11	1	-0/+7
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	[ci skip] Update instrumentation guide for ActiveStorage	Yoshiyuki Hirano	2017-12-12	1	-0/+7
\| \| \|/ \| \|/\|
* / \|	Invoke mogrify once when transforming an image	George Claghorn	2017-12-11	1	-6/+8
\|/ /
* \|	Merge pull request #30361 from mfo/master	Eileen M. Uchitelle	2017-12-11	4	-1/+25
\|\ \
\| * \|	fix(streaming_template_renderer): I18n.locale broken in layout. I18n gem stor...	mfo	2017-11-25	4	-1/+25
* \| \|	Merge pull request #31389 from yhirano55/webpack_config_in_active_storage	Javan Makhmali	2017-12-11	1	-1/+0
\|\ \ \
\| * \| \|	`webpack` is assigned but never used in webpack.config.js	Yoshiyuki Hirano	2017-12-11	1	-1/+0
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #31390 from lonre/patch-1	Eileen M. Uchitelle	2017-12-10	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Update validates.rb	Lonre Wang	2017-12-10	1	-1/+1
\|/ /
* \|	Reset schema cache after test	yuuji.yaginuma	2017-12-10	1	-0/+2
* \|	Merge pull request #31384 from rails/dont-override-server	Guillermo Iguaran	2017-12-09	3	-2/+24
\|\ \
\| * \|	Change the system tests to set Puma as default server only when the user have...	Guillermo Iguaran	2017-12-09	3	-2/+24
\|/ /
* \|	Add secure `X-Download-Options` and `X-Permitted-Cross-Domain-Policies` to de...	Guillermo Iguaran	2017-12-09	4	-4/+15
* \|	Merge pull request #31379 from bogdanvlviv/ci-against-jruby_9_1_15	Ryuta Kamizono	2017-12-09	1	-3/+3
\|\ \
\| * \|	CI against JRuby 9.1.15.0	bogdanvlviv	2017-12-08	1	-3/+3
* \| \|	Merge pull request #31354 from maciej-ka/docs-link_to-nil-name-example	Claudio B	2017-12-08	1	-0/+5
\|\ \ \
\| * \| \|	docs: add example for a nil name in link_to	maciej-ka	2017-12-07	1	-0/+5
* \| \| \|	Merge pull request #31355 from rails/fix-rails-env-with-ruby	Aaron Patterson	2017-12-08	5	-3/+82
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|