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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #15392 from arthurnn/move_open_transactions	Rafael Mendonça França	2014-05-28	2	-4/+4
\|\
\| *	Keep closer to other methods that touch @transaction	Arthur Neves	2014-05-28	2	-4/+4
* \|	Maintain column order when overriding existing columns	Sean Griffin	2014-05-28	1	-3/+8
\|/
*	Merge pull request #15389 from sgrif/sg-property-inheritance	Rafael Mendonça França	2014-05-28	1	-5/+7
\|\
\| *	Ensure custom properties work correctly with inheritance	Sean Griffin	2014-05-28	1	-5/+7
* \|	Merge pull request #15370 from sgrif/sg-type-namespace	Rafael Mendonça França	2014-05-28	38	-500/+461
\|\ \
\| * \|	Move types to the top level `ActiveRecord` namespace	Sean Griffin	2014-05-27	38	-500/+461
* \| \|	Formatting of content from b1db615 [ci skip]	Zachary Scott	2014-05-28	1	-3/+7
* \| \|	Merge pull request #15380 from Gaurav2728/gaurav-transaction_isolation_error	Zachary Scott	2014-05-28	1	-0/+3
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Initial doc for TransactionIsolationError [ci skip]	Gaurav Sharma	2014-05-28	1	-0/+3
* \| \|	Merge pull request #15387 from sgrif/sg-remove-column-coder	Santiago Pastorino	2014-05-28	1	-14/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Remove unused `Column#coder`	Sean Griffin	2014-05-28	1	-14/+1
\| \|/
* /	pg, keep `hstore` and `json` attributes as `Hash` in @attributes.	Yves Senn	2014-05-28	2	-2/+14
\|/
*	Merge pull request #15374 from sgrif/sg-private-properties	Rafael Mendonça França	2014-05-27	11	-24/+12
\|\
\| *	Remove AR Properties from the public API	Sean Griffin	2014-05-27	11	-24/+12
* \|	Merge pull request #15269 from arunagw/aa-fixes-8930	Rafael Mendonça França	2014-05-27	1	-1/+1
\|\ \
\| * \|	rake railties:install:migrations respects the order of railties	Arun Agrawal	2014-05-27	1	-1/+1
* \| \|	Merge pull request #14834 from al2o3cr/issue14155	Aaron Patterson	2014-05-27	2	-2/+21
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	WIP: pass existing joins to construct_join_dependency	Matt Jones	2014-05-16	2	-2/+21
* \| \|	Merge pull request #15295 from sgrif/sg-deprecate-decimals	Rafael Mendonça França	2014-05-27	3	-1/+16
\|\ \ \
\| * \| \|	Deprecate decimal columns being automatically treated as integers	Sean Griffin	2014-05-27	3	-1/+16
* \| \| \|	Merge pull request #15358 from arthurnn/redefine_habtm_fix	Rafael Mendonça França	2014-05-27	1	-24/+23
\|\ \ \ \
\| * \| \| \|	Fix redefine a has_and_belongs_to_many inside inherited class	Arthur Neves	2014-05-27	1	-24/+23
* \| \| \| \|	Merge pull request #15359 from kuldeepaggarwal/f-remove-unwanted_to_sym	Yves Senn	2014-05-27	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	remove unwanted `to_sym` call.	Kuldeep Aggarwal	2014-05-26	1	-1/+1
* \| \| \| \|	Merge pull request #15301 from zzak/issue_15212	Rafael Mendonça França	2014-05-26	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	Skip if the association was already loaded.	Zachary Scott	2014-05-24	1	-0/+1
\| \|/ / / /
* \| \| \| \|	Merge pull request #15353 from sgrif/sg-mysql-condition	Rafael Mendonça França	2014-05-26	1	-2/+0
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Remove unnecessary branch from quoting in Mysql	Sean Griffin	2014-05-26	1	-2/+0
* \| \| \| \|	Add a public API to allow users to specify column types	Sean Griffin	2014-05-26	14	-22/+118
\|/ / / /
* \| \| \|	Allow empty arrays in where predicates	Sean Griffin	2014-05-26	1	-0/+2
* \| \| \|	Merge pull request #15351 from sgrif/sg-allowed-types	Rafael Mendonça França	2014-05-26	1	-4/+9
\|\ \ \ \
\| * \| \| \|	Extract types which don't require additional typecasting to a method	Sean Griffin	2014-05-26	1	-4/+9
* \| \| \| \|	Merge pull request #15300 from arthurnn/refactor_reflections	Rafael Mendonça França	2014-05-26	14	-33/+71
\|\ \ \ \ \
\| * \| \| \| \|	Refactoring .reflections public method.	Arthur Neves	2014-05-26	4	-9/+28
\| * \| \| \| \|	Use .to_s on _reflections lookup	Arthur Neves	2014-05-24	2	-2/+2
\| * \| \| \| \|	Merge pull request #15210 from arthurnn/fix_hbtm_reflection	Arthur Neves	2014-05-24	14	-29/+48
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Refactor the handling of arrays in where predicates	Sean Griffin	2014-05-26	1	-11/+14
\| \|/ / / \|/\| \| \|
* \| \| \|	Refactor the type casting of booleans in MySQL	Sean Griffin	2014-05-26	2	-13/+18
* \| \| \|	Remove checks against `column.type` in abstract adapter quoting	Sean Griffin	2014-05-26	3	-34/+21
* \| \| \|	Merge pull request #15307 from sgrif/sg-type-cast-for-write	Yves Senn	2014-05-26	5	-9/+19
\|\ \ \ \
\| * \| \| \|	Add an interface for type objects to control Ruby => SQL	Sean Griffin	2014-05-26	5	-9/+19
* \| \| \| \|	pg, add missing `:nodoc:` to adapter.	Yves Senn	2014-05-26	1	-8/+8
* \| \| \| \|	pg, remove unused code. Use `extract_schema_and_table` instead.	Yves Senn	2014-05-26	1	-10/+0
\| \|/ / / \|/\| \| \|
* \| \| \|	pg, remove duplicated code.	Yves Senn	2014-05-24	1	-4/+0
* \| \| \|	pg, extract schema definitions into separate file.	Yves Senn	2014-05-24	2	-135/+141
\|/ / /
* \| \|	Merge pull request #15290 from sgrif/sg-consolidate-zero-scale-decimal	Rafael Mendonça França	2014-05-23	5	-35/+32
\|\ \ \
\| * \| \|	Remove special case in schema dumper for decimal without scale	Sean Griffin	2014-05-23	5	-35/+32
* \| \| \|	Merge pull request #15285 from sergey-alekseev/remove-active-record-where-dup...	Rafael Mendonça França	2014-05-23	1	-8/+4
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Remove duplicated parameter check on #where!	Sergey Alekseev	2014-05-23	1	-8/+4