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

	Commit message (Expand)	Author	Age	Files	Lines
*	Extract `build_scope` and `predicate_builder` in `Reflection`	Ryuta Kamizono	2017-06-24	3	-12/+14
*	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
\| \|_\|/ \|/\| \|
* \| \|	Merge pull request #29378 from kamipo/avoid_overwriting_id_attribute_methods	Rafael França	2017-06-14	1	-7/+3
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Avoid overwriting the methods of `AttributeMethods::PrimaryKey`	Ryuta Kamizono	2017-06-07	1	-7/+3
\| \|/
* /	Remove `null_allowed` option from doc [ci skip]	yuuji.yaginuma	2017-06-10	1	-2/+1
\|/
*	[ci skip] UNIQUE constraint affects not only INSERT but also UPDATE	Ryuta Kamizono	2017-06-06	1	-1/+1
*	Don't mark the schema loaded until it's really finished	Matthew Draper	2017-06-05	1	-3/+5
*	Merge pull request #29294 from gsamokovarov/attributes-default	Kasper Timm Hansen	2017-06-04	5	-21/+10
\|\
\| *	Use mattr_accessor default: option throughout the project	Genadi Samokovarov	2017-06-03	5	-21/+10
* \|	[ci skip] Add missing `be`	Prathamesh Sonpatki	2017-06-03	1	-1/+1
\|/
*	Merge pull request #29135 from Nerian/document_support_for_composite_primary_...	Eileen M. Uchitelle	2017-06-02	1	-0/+19
\|\
\| *	Document support for composite primary keys	Nerian	2017-05-18	1	-0/+19
* \|	Merge pull request #29282 from kamipo/prevent_making_bind_param_if_casted_val...	Eileen M. Uchitelle	2017-06-02	2	-8/+13
\|\ \
\| * \|	Prevent making bind param if casted value is nil	Ryuta Kamizono	2017-05-31	2	-8/+13
* \| \|	Merge pull request #29220 from kamipo/consolidate_database_specific_json_types	Matthew Draper	2017-06-01	7	-45/+35
\|\ \ \
\| * \| \|	Consolidate database specific JSON types to `Type::Json`	Ryuta Kamizono	2017-05-30	7	-45/+35
* \| \| \|	Merge pull request #29293 from kamipo/fix_sti_with_default_scope	Matthew Draper	2017-06-01	1	-1/+5
\|\ \ \ \
\| * \| \| \|	Fix `default_scoped` with defined `default_scope` on STI model	Ryuta Kamizono	2017-05-31	1	-1/+5
\| \| \|/ / \| \|/\| \|
* \| \| \|	Should use `quote` for a string literal	Ryuta Kamizono	2017-06-01	1	-1/+1
* \| \| \|	Add missing `delegate :extending, to: :all`	Ryuta Kamizono	2017-06-01	1	-1/+1
\|/ / /
* \| \|	Merge pull request #29261 from kamipo/dont_expose_methods_and_attrs_for_inter...	Matthew Draper	2017-05-31	7	-29/+39
\|\ \ \
\| * \| \|	Don't expose methods and attrs for internal usage	Ryuta Kamizono	2017-05-30	7	-29/+39
\| \|/ /