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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #28867 from eugeneius/skip_query_cache_in_batches	Matthew Draper	2017-07-09	11	-20/+224
\|\
\| *	Skip query cache for in_batches and friends	Eugene Kenny	2017-07-06	10	-20/+216
* \|	Merge pull request #29692 from fimmtiu/avoid-translating-non-database-exceptions	Matthew Draper	2017-07-09	3	-2/+31
\|\ \
\| * \|	Remove driver-specific hard-coding in the tests.	Dennis Taylor	2017-07-07	1	-9/+1
\| * \|	Rename the StatementInvalid test method for clarity.	Dennis Taylor	2017-07-07	1	-1/+1
\| * \|	Fix changelog wording as suggested.	Dennis Taylor	2017-07-07	1	-2/+2
\| * \|	Use StandardError instead of RuntimeError.	Dennis Taylor	2017-07-06	1	-2/+2
\| * \|	Fix indentation style for private method.	Dennis Taylor	2017-07-05	1	-5/+5
\| * \|	Don't translate non-database exceptions.	Dennis Taylor	2017-07-05	3	-2/+39
\| \|/
* \|	Merge pull request #29297 from palkan/fix/action-cable-postgres-identifiers-l...	Matthew Draper	2017-07-09	3	-3/+31
\|\ \
\| * \|	[Fix #28751] Hash stream long stream identifiers when using Postgres adapter	palkan	2017-07-06	3	-3/+31
\| \|/
* \|	Merge pull request #29495 from eugeneius/_write_attribute	Matthew Draper	2017-07-09	6	-13/+19
\|\ \
\| * \|	Rename raw_write_attribute to write_attribute_without_type_cast	Eugene Kenny	2017-07-07	3	-8/+8
\| * \|	Improve the performance of writing attributes	Eugene Kenny	2017-06-18	4	-8/+14
* \| \|	Merge pull request #29695 from y-yagi/secrets_show	Matthew Draper	2017-07-09	4	-1/+22
\|\ \ \
\| * \| \|	Add `rails secrets:show` command	yuuji.yaginuma	2017-07-07	4	-1/+22
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #29705 from y-yagi/do_not_update_secrets_yml_enc	Matthew Draper	2017-07-09	2	-1/+21
\|\ \ \
\| * \| \|	Do not update `secrets.yml.enc` when secretes do not change	yuuji.yaginuma	2017-07-07	2	-1/+21
\| \|/ /
* \| \|	Merge pull request #29706 from kamipo/use_information_schema_to_extract_expre...	Matthew Draper	2017-07-09	2	-2/+2
\|\ \ \
\| * \| \|	Use `information_schema` to extract `generation_expression` for MariaDB	Ryuta Kamizono	2017-07-07	2	-2/+2
* \| \| \|	Merge pull request #29708 from kamipo/fix_current_timestamp_for_mariadb	Matthew Draper	2017-07-09	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Fix default `CURRENT_TIMESTAMP` in schema dumping for MariaDB 10.2	Ryuta Kamizono	2017-07-07	1	-2/+2
\| \|/ / /
* \| \| \|	Merge pull request #29718 from ragesoss/master	Richard Schneeman	2017-07-08	1	-2/+20
\|\ \ \ \
\| * \| \| \|	Clarify i18n guide for how pluralization rules work by default	Sage Ross	2017-07-07	1	-2/+20
* \| \| \| \|	Don't call register on custom drivers	eileencodes	2017-07-08	2	-5/+5
* \| \| \| \|	Merge pull request #29680 from koic/update_default_app_files_in_app_generator...	Eileen M. Uchitelle	2017-07-08	1	-2/+40
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Update default app files in app_generator_test	Koichi ITO	2017-07-06	1	-2/+40
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #29714 from jahfer/implement-errors-merge	Rafael França	2017-07-07	3	-0/+28
\|\ \ \ \
\| * \| \| \|	Add ActiveModel::Errors#merge!	Jahfer Husain	2017-07-07	3	-0/+28
\| \| \|/ / \| \|/\| \|
* / \| \|	Test thor master	Rafael Mendonça França	2017-07-07	2	-1/+8
\|/ / /
* \| \|	Merge pull request #29704 from kamipo/fix_mariadb_version	Jeremy Daer	2017-07-06	1	-2/+6
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix extracting MariaDB version	Ryuta Kamizono	2017-07-07	1	-2/+6
\|/ /
* \|	Merge pull request #29662 from deivid-rodriguez/engine_multiple_mount_points	Rafael França	2017-07-05	5	-10/+112
\|\ \
\| * \|	Allow mounting same engine under several locations	David Rodríguez	2017-07-05	5	-10/+112
* \| \|	Merge pull request #29676 from lugray/fix_date_time_serialize	Rafael França	2017-07-05	2	-0/+17
\|\ \ \
\| * \| \|	Fix `ActiveModel::Type::DateTime#serialize`	Lisa Ugray	2017-07-05	2	-0/+17
\| \|/ /
* \| \|	Merge pull request #28668 from Dorian/mention-time-parse-argument-error	Aaron Patterson	2017-07-05	2	-1/+13
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Mention and test for possible ArgumentError when parsing times	Dorian Marié	2017-04-08	2	-1/+13
* \| \|	Merge pull request #29677 from eugeneius/parameters_configuration_tests	Rafael Mendonça França	2017-07-05	1	-0/+36
\|\ \ \
\| * \| \|	Fix Parameters configuration integration tests	Eugene Kenny	2017-07-04	1	-0/+41
* \| \| \|	Force ActionController::Base lazy laod hooks to run	Rafael Mendonça França	2017-07-05	1	-0/+12
* \| \| \|	Merge pull request #29690 from kamipo/fix_warnings	Rafael França	2017-07-05	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Fix warning: `*' interpreted as argument prefix	Ryuta Kamizono	2017-07-06	1	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #29687 from k3rni/private-prefixed-delegate	Matthew Draper	2017-07-06	2	-1/+39
\|\ \ \ \
\| * \| \| \|	Use `map` in `delegate` so that actual prefixed method names are returned, if...	Krzysztof Zych	2017-07-05	2	-1/+40
\|/ / / /
* \| \| \|	Merge pull request #29413 from kamipo/fix_association_with_scope_including_joins	Rafael França	2017-07-04	9	-70/+60
\|\ \ \ \
\| * \| \| \|	Fix eager loading association with scope including joins	Ryuta Kamizono	2017-07-04	4	-11/+28
\| * \| \| \|	Fix preloading association with scope including joins	Ryuta Kamizono	2017-07-04	6	-49/+32
\| * \| \| \|	Remove unused `association_key` and `table` methods in `Preloader::Association`	Ryuta Kamizono	2017-07-04	1	-10/+0
* \| \| \| \|	Merge pull request #29667 from kamipo/add_missing_attr_name_to_s	Rafael França	2017-07-04	1	-2/+3
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|