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

	Commit message (Expand)	Author	Age	Files	Lines
*	ActiveRecord: do not create "has many through" records that have been removed	Tobias Kraze	2017-06-28	1	-0/+11
*	Merge pull request #29571 from kamipo/fix_extracting_references_via_order_values	Rafael França	2017-06-26	1	-0/+6
\|\
\| *	Fix extracting `references` via `order_values` to respect quoting	Ryuta Kamizono	2017-06-26	1	-0/+6
* \|	Merge pull request #29568 from kamipo/ensure_using_correct_alias_tracker	Rafael França	2017-06-26	2	-1/+2
\|\ \
\| * \|	Ensure that using correct alias tracker	Ryuta Kamizono	2017-06-25	2	-1/+2
\| \|/
* \|	Merge pull request #29511 from jhawthorn/clear_offsets_cache_on_collection_proxy	Rafael França	2017-06-26	1	-0/+35
\|\ \
\| * \|	Move clearing of @offsets cache to reset_scope	John Hawthorn	2017-06-21	1	-12/+21
\| * \|	Clear offset cache on CollectionProxy reset/reload	John Hawthorn	2017-06-20	1	-0/+26
* \| \|	Merge pull request #29519 from Edouard-chin/ec-structure-flags-order	Rafael França	2017-06-26	1	-2/+2
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	pass `structure_dump_flags` / `structure_load_flags` options before any other:	Edouard CHIN	2017-06-21	1	-2/+2
* \| \|	Remove unused variable	yuuji.yaginuma	2017-06-22	1	-1/+1
* \| \|	Keep INNER JOIN when merging relations	Maxime Lapointe	2017-06-20	1	-2/+21
\| \|/ \|/\|
* \|	Fix ActiveRecord::Persistence#touch with locking	bogdanvlviv	2017-06-21	2	-2/+27
* \|	Fix destroy with locking_column value null	bogdanvlviv	2017-06-20	1	-0/+25
* \|	Merge pull request #29504 from kirs/fixtures-arel-bulk	Rafael França	2017-06-20	3	-1/+38
\|\ \
\| * \|	Use bulk INSERT to insert fixtures	Kir Shatrov	2017-06-20	3	-1/+38
* \| \|	Merge pull request #28833 from bogdanvlviv/add-test-cases-for-optimistic-locking	Rafael França	2017-06-20	1	-0/+19
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Add test cases for optimistic locking	bogdanvlviv	2017-06-12	1	-0/+19
* \| \|	Merge pull request #29454 from kamipo/fix_exists_queries_with_cache	Rafael França	2017-06-19	1	-0/+46
\|\ \ \
\| * \| \|	Ensure query caching for `select_*` methods in connection adapters	Ryuta Kamizono	2017-06-15	1	-0/+40
\| * \| \|	Fix `Relation#exists?` queries with query cache	Ryuta Kamizono	2017-06-15	1	-0/+6
* \| \| \|	Merge pull request #29491 from kamipo/add_test_case_for_28754	Matthew Draper	2017-06-18	1	-0/+19
\|\ \ \ \
\| * \| \| \|	Add a test case for #28754	Ryuta Kamizono	2017-06-18	1	-0/+19
* \| \| \| \|	Remove debug print	Ryuta Kamizono	2017-06-18	1	-13/+0
\|/ / / /
* \| \| \|	Merge pull request #29415 from kamipo/remove_unused_defined_association	Guillermo Iguaran	2017-06-16	2	-2/+1
\|\ \ \ \
\| * \| \| \|	Remove unused defined association	Ryuta Kamizono	2017-06-11	2	-2/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #29455 from kirs/remove-column-with-fk-mysql	Guillermo Iguaran	2017-06-16	1	-0/+10
\|\ \ \ \
\| * \| \| \|	Remove FK together with column in MySQL	Kir Shatrov	2017-06-16	1	-0/+10
\| \|/ / /
* \| \| \|	Merge pull request #29392 from alexcameron89/unpersisted_create_association	Matthew Draper	2017-06-17	2	-1/+10
\|\ \ \ \
\| * \| \| \|	Raise on create for singular association when parent is unpersisted	Alex Kitchens	2017-06-08	2	-1/+10
\| \|/ / /
* \| \| \|	Merge pull request #29431 from kamipo/fix_create_table_with_query_from_relation	Matthew Draper	2017-06-17	1	-6/+4
\|\ \ \ \
\| * \| \| \|	Fix `create_table` with query from relation	Ryuta Kamizono	2017-06-13	1	-6/+4
\| \|/ / /
* \| \| \|	Merge pull request #29461 from dnl/unscope_where_or	Matthew Draper	2017-06-17	1	-0/+25
\|\ \ \ \
\| * \| \| \|	Don't require 'unscope' to be the same for both sides of a 'or' relation.	Dan Sherson	2017-06-15	1	-0/+25
* \| \| \| \|	Use nullable `id` column instead of a primary key	Ryuta Kamizono	2017-06-16	1	-1/+2
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge pull request #29464 from eugeneius/raw_write_attribute	Rafael França	2017-06-15	1	-0/+6
\|\ \ \ \
\| * \| \| \|	Don't map id to primary key in raw_write_attribute	Eugene Kenny	2017-06-15	1	-0/+6
\| \|/ / /
* \| \| \|	Merge pull request #29462 from kamipo/fix_dump_schema_information_with_empty_...	Rafael França	2017-06-15	1	-0/+6
\|\ \ \ \
\| * \| \| \|	Fix `dump_schema_information` with empty versions	Ryuta Kamizono	2017-06-15	1	-0/+6
\| \|/ / /
* \| \| \|	Merge pull request #29453 from kamipo/add_test_case_for_28274	Guillermo Iguaran	2017-06-15	1	-0/+46
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Add test cases for #28274	Ryuta Kamizono	2017-06-15	1	-0/+46
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #29409 from eugeneius/skip_test_uuid_column_default	Rafael França	2017-06-15	1	-1/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Allow `uuid_test.rb` to be loaded on all adapters	Eugene Kenny	2017-06-14	1	-1/+2
\| \|/
* \|	Merge pull request #29378 from kamipo/avoid_overwriting_id_attribute_methods	Rafael França	2017-06-14	3	-12/+21
\|\ \
\| * \|	Avoid overwriting the methods of `AttributeMethods::PrimaryKey`	Ryuta Kamizono	2017-06-07	3	-12/+21
\| \|/
* \|	Use `require_relative` instead of `require` with full path	bogdanvlviv	2017-06-14	1	-1/+1
* \|	Add test for backward compatibility when using change_table	Koichi ITO	2017-06-13	1	-0/+15
\|/
*	Merge pull request #28868 from yahonda/pg10_oid_unknown_to_text	Matthew Draper	2017-06-07	1	-8/+8
\|\
\| *	PostgreSQL 10 converts unknown OID 705 to text 25	Yasuo Honda	2017-06-06	1	-8/+8
* \|	Merge pull request #29362 from kamipo/remove_redundant_assert_nothing_raised	Matthew Draper	2017-06-06	3	-11/+0
\|\ \