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

	Commit message (Expand)	Author	Age	Files	Lines
*	Remove extra `.merge!(order: "id")` for `Relation#first` in tests	Ryuta Kamizono	2017-07-13	2	-32/+28
*	Merge pull request #29715 from reverbdotcom/ptd/fix-invalid-uuids	Matthew Draper	2017-07-09	1	-1/+3
\|\
\| *	Don't allow uuids with orphan curly braces	pdebelak	2017-07-07	1	-1/+3
* \|	Merge pull request #28867 from eugeneius/skip_query_cache_in_batches	Matthew Draper	2017-07-09	5	-1/+179
\|\ \
\| * \|	Skip query cache for in_batches and friends	Eugene Kenny	2017-07-06	5	-1/+179
\| \|/
* \|	Merge pull request #29692 from fimmtiu/avoid-translating-non-database-exceptions	Matthew Draper	2017-07-09	1	-0/+22
\|\ \
\| * \|	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
\| * \|	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	1	-0/+30
\| \|/
* /	Use `information_schema` to extract `generation_expression` for MariaDB	Ryuta Kamizono	2017-07-07	1	-1/+1
\|/
*	Fix `ActiveModel::Type::DateTime#serialize`	Lisa Ugray	2017-07-05	1	-0/+13
*	Merge pull request #29413 from kamipo/fix_association_with_scope_including_joins	Rafael França	2017-07-04	3	-0/+8
\|\
\| *	Fix eager loading association with scope including joins	Ryuta Kamizono	2017-07-04	1	-0/+1
\| *	Fix preloading association with scope including joins	Ryuta Kamizono	2017-07-04	3	-0/+7
* \|	Merge pull request #29653 from kamipo/fix_test_copying_migrations_preserving_...	Rafael França	2017-07-04	2	-2/+3
\|\ \ \| \|/ \|/\|
\| *	Fix `test_copying_migrations_preserving_magic_comments`	Ryuta Kamizono	2017-07-02	2	-2/+3
* \|	Merge pull request #29658 from kamipo/remove_redundant_assert_respond_to	Kasper Timm Hansen	2017-07-02	1	-26/+0
\|\ \
\| * \|	Remove redundant `assert_respond_to`	Ryuta Kamizono	2017-07-03	1	-26/+0
* \| \|	:warning: "Use assert_nil if expecting nil. This will fail in Minitest 6."	Akira Matsuda	2017-07-02	1	-1/+1
\|/ /
* \|	Apply record state based on parent transaction state	eileencodes	2017-07-01	1	-0/+70
* \|	Deprecate and replace `set_state` method	eileencodes	2017-07-01	1	-0/+38
\|/
*	Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"	Matthew Draper	2017-07-02	432	-444/+12
*	Merge pull request #29540 from kirs/rubocop-frozen-string	Matthew Draper	2017-07-02	432	-12/+444
\|\
\| *	Enforce frozen string in Rubocop	Kir Shatrov	2017-07-01	432	-12/+444
* \|	Merge pull request #29506 from pat/frozen-string-literals	Matthew Draper	2017-07-02	7	-17/+17
\|\ \
\| * \|	Make ActiveRecord frozen string literal friendly.	Pat Allan	2017-06-20	7	-17/+17
* \| \|	Merge pull request #29631 from kamipo/should_be_clear_association_ids	Matthew Draper	2017-07-01	1	-0/+5
\|\ \ \
\| * \| \|	Should be clear `@association_ids` when joined newly associated record	Ryuta Kamizono	2017-06-30	1	-0/+5
* \| \| \|	Merge pull request #28808 from fschwahn/fix-polymorphic-automic-inverse	Matthew Draper	2017-07-01	2	-6/+16
\|\ \ \ \
\| * \| \| \|	Add regression test for setting inverse instances on normal & polymorphic rel...	Fabian Schwahn	2017-04-20	1	-0/+14
\| * \| \| \|	Remove :polymorphic from INVALID_AUTOMATIC_INVERSE_OPTIONS	Fabian Schwahn	2017-04-20	1	-6/+2
* \| \| \| \|	Merge pull request #29536 from nickrivadeneira/fix-yaml	Matthew Draper	2017-07-01	1	-0/+8
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Ensure `false` is preserved in attr serialization	Nick Rivadeneira	2017-06-22	1	-0/+8
* \| \| \| \|	Merge pull request #29623 from kamipo/should_use_same_connection_in_query_cache	Rafael França	2017-06-29	1	-7/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Should use the same connection in using query cache	Ryuta Kamizono	2017-06-29	1	-7/+1
* \| \| \| \|	Deprecate delegating to `arel` in `Relation`	Ryuta Kamizono	2017-06-29	1	-0/+15
* \| \| \| \|	Merge pull request #29616 from kamipo/remove_unused_aliased_table_name	Rafael França	2017-06-29	1	-1/+0
\|\ \ \ \ \
\| * \| \| \| \|	Remove unused `aliased_table_name` in `Association`	Ryuta Kamizono	2017-06-29	1	-1/+0
* \| \| \| \| \|	Fix to scoping is correctly restored	Ryuta Kamizono	2017-06-29	1	-0/+9
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #29416 from kamipo/remove_unused_subject_model	Rafael França	2017-06-28	1	-14/+0
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Remove unused `Subject` model in tests	Ryuta Kamizono	2017-06-11	1	-14/+0
* \| \| \| \|	Merge pull request #29405 from kamipo/locked_should_not_build_arel	Rafael França	2017-06-28	2	-0/+7
\|\ \ \ \ \
\| * \| \| \| \|	Remove delegating to arel in a relation	Ryuta Kamizono	2017-06-29	2	-1/+2
\| * \| \| \| \|	`Relation#locked?` should not build arel	Ryuta Kamizono	2017-06-20	1	-0/+6
* \| \| \| \| \|	Merge pull request #29614 from kamipo/show_query_cache_keys_2	Rafael França	2017-06-28	1	-1/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Show query cache keys in `test_middleware_caches`	Ryuta Kamizono	2017-06-29	1	-1/+2
* \| \| \| \| \| \|	Merge pull request #29601 from kamipo/fix_eager_loading_to_respect_store_full...	Rafael Mendonça França	2017-06-28	1	-10/+17
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix eager loading to respect `store_full_sti_class` setting	Ryuta Kamizono	2017-06-29	1	-10/+17
\| \|/ / / / / /