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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #29853 from lugray/move_generator_namespacing_to_base	Rafael França	2017-07-24	2	-36/+37
\|\
\| *	Move generator namespacing to Base	Lisa Ugray	2017-07-19	2	-36/+37
* \|	Merge pull request #29792 from lugray/delegate_respond_to	Rafael França	2017-07-24	2	-2/+21
\|\ \
\| * \|	Delegate respond_to? in ActionView::Helpers::ControllerHelper	Lisa Ugray	2017-07-19	2	-2/+21
* \| \|	Merge pull request #29765 from lugray/fix_counter_cache	Rafael França	2017-07-24	4	-4/+18
\|\ \ \
\| * \| \|	Add test for fixed `counter_cache` double increment	Lisa Ugray	2017-07-19	4	-4/+18
* \| \| \|	Merge pull request #29912 from rails/revert-29911-schneems/rack-mini-profiler	Rafael França	2017-07-24	2	-7/+0
\|\ \ \ \
\| * \| \| \|	Revert "Include rack-mini-profiler by default"	Rafael França	2017-07-24	2	-7/+0
\|/ / / /
* \| \| \|	Merge pull request #29911 from schneems/schneems/rack-mini-profiler	Sean Griffin	2017-07-24	2	-0/+7
\|\ \ \ \
\| * \| \| \|	Include rack-mini-profiler by default	schneems	2017-07-24	2	-0/+7
\|/ / / /
* \| \| \|	Fix test failures when prepared statements are disabled	Sean Griffin	2017-07-24	3	-14/+35
* \| \| \|	Fix build failures on PG	Sean Griffin	2017-07-24	1	-0/+4
* \| \| \|	Merge pull request #29905 from kamipo/remove_duplicated_assertion	Sean Griffin	2017-07-24	1	-16/+2
\|\ \ \ \
\| * \| \| \|	Remove duplicated assertion in `test_count_with_join`	Ryuta Kamizono	2017-07-24	1	-16/+2
* \| \| \| \|	Fix build failures on MySQL	Sean Griffin	2017-07-24	2	-2/+2
* \| \| \| \|	Refactor Active Record to let Arel manage bind params	Sean Griffin	2017-07-24	37	-459/+283
* \| \| \| \|	Merge pull request #29894 from eugeneius/check_schema_file_dup_string	Kasper Timm Hansen	2017-07-24	2	-1/+8
\|\ \ \ \ \
\| * \| \| \| \|	Avoid modifying frozen string in check_schema_file	Eugene Kenny	2017-07-23	2	-1/+8
* \| \| \| \| \|	Merge pull request #29907 from deivid-rodriguez/fix_flaky_message_verifier_test	Kasper Timm Hansen	2017-07-24	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix test failure in message verifier tests	David Rodríguez	2017-07-24	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #29906 from assain/add_more_tests_to_message_verifier	Kasper Timm Hansen	2017-07-24	1	-0/+15
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	add metadata tests: verify method	Assain	2017-07-24	1	-0/+15
\|/ / / / / /
* \| \| \| \| \|	[ci skip] Remove superfluous paragraphs; fully qualify constants.	Kasper Timm Hansen	2017-07-24	1	-8/+2
* \| \| \| \| \|	Merge pull request #29892 from assain/documenation_for_metadata	Kasper Timm Hansen	2017-07-24	3	-0/+100
\|\ \ \ \ \ \
\| * \| \| \| \| \|	add to changelog: purpose and expiry support	Assain	2017-07-24	1	-0/+28
\| * \| \| \| \| \|	document metadata support added to message encryptor and message verifier	Assain	2017-07-24	2	-0/+72
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #29860 from georgeclaghorn/travel-back-automatically	Rafael França	2017-07-24	3	-8/+8
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Remove time stubs after each test	George Claghorn	2017-07-22	3	-8/+8
* \| \| \| \| \|	Merge pull request #29820 from kirs/frozen-actioncable	Sean Griffin	2017-07-23	81	-1/+159
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Use frozen string literal in actioncable/	Kir Shatrov	2017-07-23	81	-1/+159
* \| \| \| \| \| \|	Merge pull request #29900 from kirs/actionview-frozen-friendly	Sean Griffin	2017-07-23	1	-1/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Make actionview ready for frozen strings	Kir Shatrov	2017-07-23	1	-1/+2
* \| \| \| \| \| \|	Merge pull request #29901 from kirs/actioncable-frozen-friendly	Sean Griffin	2017-07-23	1	-1/+5
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Make actioncable ready for frozen strings	Kir Shatrov	2017-07-23	1	-1/+5
* \| \| \| \| \| \|	Merge pull request #29896 from kirs/frozen-actionmailer	Richard Schneeman	2017-07-23	43	-0/+84
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Use frozen string literal in actionmailer/	Kir Shatrov	2017-07-23	43	-0/+84
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'verify-release'	Kasper Timm Hansen	2017-07-23	4	-96/+138
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Update release instructions in light of new tasks.	Kasper Timm Hansen	2017-07-22	1	-44/+46
\| * \| \| \| \| \|	Support multiple versions in release announcement.	Kasper Timm Hansen	2017-07-22	2	-51/+67
\| * \| \| \| \| \|	Add task to verify a release.	Kasper Timm Hansen	2017-07-22	2	-1/+25
* \| \| \| \| \| \|	Merge pull request #29867 from koic/fix_a_failed_ar_test_when_using_oracle	Kasper Timm Hansen	2017-07-23	1	-2/+10
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix a failued AR test when using OracleAdapter	Koichi ITO	2017-07-20	1	-2/+10
* \| \| \| \| \| \| \|	Let Metadata instance handle purpose coercion.	Kasper Timm Hansen	2017-07-23	1	-4/+4
* \| \| \| \| \| \| \|	Remove dependency on `from_now` extension.	Kasper Timm Hansen	2017-07-23	1	-1/+1
\| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #29768 from janpieper/sort-enabled-extensions-in-dump	Eileen M. Uchitelle	2017-07-22	2	-1/+15
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Sort enabled adapter extensions in schema dump	Jan Pieper	2017-07-12	2	-1/+15
* \| \| \| \| \| \|	Merge pull request #29870 from kamipo/use_true_false_literals	Sean Griffin	2017-07-22	2	-14/+4
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Use `TRUE` and `FALSE` boolean literals for MySQL	Ryuta Kamizono	2017-07-20	2	-14/+6
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #29858 from y-yagi/use_argument_error_instead_of_own_error...	Rafael França	2017-07-21	2	-19/+18
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Use `ArgumentError` instead of own error class	yuuji.yaginuma	2017-07-20	2	-19/+18
\| \|/ / / / / /