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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #29593 from kratob/master	Eileen M. Uchitelle	2017-06-28	1	-0/+5
\|\
\| *	ActiveRecord: do not create "has many through" records that have been removed	Tobias Kraze	2017-06-28	1	-0/+5
* \|	Merge pull request #29556 from kamipo/extract_ordered_relation	Rafael França	2017-06-27	1	-12/+11
\|\ \
\| * \|	Extract `ordered_relation` in `FinderMethods`	Ryuta Kamizono	2017-06-24	1	-12/+11
* \| \|	Merge pull request #29589 from kamipo/refactor_join_scope	Rafael França	2017-06-27	3	-54/+21
\|\ \ \
\| * \| \|	Move building constraint to `join_scope` in `Reflection`	Ryuta Kamizono	2017-06-27	2	-41/+14
\| * \| \|	Move constructing polymorphic type to `join_scope` in `Reflection`	Ryuta Kamizono	2017-06-27	3	-16/+10
\| \| \|/ \| \|/\|
* / \|	Skip instantiating `NullPreloader` if `assoc.klass` is nil	Ryuta Kamizono	2017-06-27	1	-11/+3
\|/ /
* \|	Merge pull request #29571 from kamipo/fix_extracting_references_via_order_values	Rafael França	2017-06-26	1	-1/+1
\|\ \
\| * \|	Fix extracting `references` via `order_values` to respect quoting	Ryuta Kamizono	2017-06-26	1	-1/+1
\| \|/
* \|	Merge pull request #29557 from kamipo/extract_build_scope_and_predicate_builder	Rafael França	2017-06-26	3	-20/+21
\|\ \
\| * \|	Move constructing join scope to `Reflection`	Ryuta Kamizono	2017-06-26	2	-13/+12
\| * \|	Extract `build_scope` and `predicate_builder` in `Reflection`	Ryuta Kamizono	2017-06-24	3	-12/+14
\| \|/
* \|	Merge pull request #29568 from kamipo/ensure_using_correct_alias_tracker	Rafael França	2017-06-26	3	-14/+18
\|\ \
\| * \|	The AliasTracker#aliased_table_for needs the type caster for the joined assoc...	Ray Zane	2017-06-25	3	-14/+18
\| \|/
* \|	Merge pull request #29511 from jhawthorn/clear_offsets_cache_on_collection_proxy	Rafael França	2017-06-26	1	-0/+1
\|\ \
\| * \|	Move clearing of @offsets cache to reset_scope	John Hawthorn	2017-06-21	1	-2/+1
\| * \|	Clear offset cache on CollectionProxy reset/reload	John Hawthorn	2017-06-20	1	-0/+2
* \| \|	Merge pull request #29519 from Edouard-chin/ec-structure-flags-order	Rafael França	2017-06-26	1	-2/+2
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	PR Review	Edouard CHIN	2017-06-21	1	-2/+2
\| * \|	pass `structure_dump_flags` / `structure_load_flags` options before any other:	Edouard CHIN	2017-06-21	1	-2/+2
* \| \|	Merge pull request #29513 from kirs/fixture-yaml-fallback	Rafael França	2017-06-21	1	-5/+4
\|\ \ \
\| * \| \|	Avoid begin/rescue in fixture quoting	Kir Shatrov	2017-06-20	1	-5/+4
\| \| \|/ \| \|/\|
* / \|	Keep INNER JOIN when merging relations	Maxime Lapointe	2017-06-20	1	-3/+3
\|/ /
* \|	Fix ActiveRecord::Persistence#touch with locking	bogdanvlviv	2017-06-21	1	-1/+1
* \|	Fix destroy with locking_column value null	bogdanvlviv	2017-06-20	1	-1/+1
* \|	Merge pull request #29504 from kirs/fixtures-arel-bulk	Rafael França	2017-06-20	4	-9/+74
\|\ \
\| * \|	Use bulk INSERT to insert fixtures	Kir Shatrov	2017-06-20	4	-9/+74
* \| \|	Merge pull request #28833 from bogdanvlviv/add-test-cases-for-optimistic-locking	Rafael França	2017-06-20	1	-3/+4
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Clean up 'Optimistic Locking' implementation	bogdanvlviv	2017-06-12	1	-3/+4
* \| \|	Merge pull request #29454 from kamipo/fix_exists_queries_with_cache	Rafael França	2017-06-19	2	-51/+0
\|\ \ \
\| * \| \|	Ensure query caching for `select_*` methods in connection adapters	Ryuta Kamizono	2017-06-15	3	-52/+1
\| * \| \|	Fix `Relation#exists?` queries with query cache	Ryuta Kamizono	2017-06-15	1	-1/+1
* \| \| \|	Merge pull request #29494 from kamipo/prevent_extra_scope_construction	Rafael França	2017-06-19	3	-3/+5
\|\ \ \ \
\| * \| \| \|	Prevent extra `scope` construction in `find_target`	Ryuta Kamizono	2017-06-18	3	-3/+5
* \| \| \| \|	Merge pull request #29486 from kirs/fixtures-arel	Rafael França	2017-06-19	1	-4/+11
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Refactor #insert_fixtures to use Arel	Kir Shatrov	2017-06-19	1	-4/+11
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #29455 from kirs/remove-column-with-fk-mysql	Guillermo Iguaran	2017-06-16	1	-0/+7
\|\ \ \ \
\| * \| \| \|	Remove FK together with column in MySQL	Kir Shatrov	2017-06-16	1	-0/+7
* \| \| \| \|	Merge pull request #29392 from alexcameron89/unpersisted_create_association	Matthew Draper	2017-06-17	1	-0/+4
\|\ \ \ \ \
\| * \| \| \| \|	Raise on create for singular association when parent is unpersisted	Alex Kitchens	2017-06-08	1	-0/+4
\| \|/ / / /
* \| \| \| \|	Merge pull request #29431 from kamipo/fix_create_table_with_query_from_relation	Matthew Draper	2017-06-17	1	-1/+6
\|\ \ \ \ \
\| * \| \| \| \|	Fix `create_table` with query from relation	Ryuta Kamizono	2017-06-13	1	-1/+6
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #29461 from dnl/unscope_where_or	Matthew Draper	2017-06-17	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Don't require 'unscope' to be the same for both sides of a 'or' relation.	Dan Sherson	2017-06-15	1	-1/+1
* \| \| \| \|	Merge pull request #29464 from eugeneius/raw_write_attribute	Rafael França	2017-06-15	1	-15/+6
\|\ \ \ \ \
\| * \| \| \| \|	Don't map id to primary key in raw_write_attribute	Eugene Kenny	2017-06-15	1	-15/+6
\| \|/ / / /
* \| \| \| \|	Fix `dump_schema_information` with empty versions	Ryuta Kamizono	2017-06-15	1	-1/+1
* \| \| \| \|	Remove deprecated option from docs [ci skip] (#29459)	Vipul A M	2017-06-15	1	-6/+6
\|/ / / /
* \| \| /	Prevent extra `sync_with_transaction_state`	Ryuta Kamizono	2017-06-15	1	-5/+2
\| \|_\|/ \|/\| \|