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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #12643 from severin/pg_cast_json_on_write	Yves Senn	2013-10-25	1	-0/+7
\|\
\| *	cast json values on write to be consistent with reading from the db.	Severin Schoepke	2013-10-25	1	-0/+7
* \|	prevent `time_zone_aware_attributes` test leak. follow-up to #12633.	Yves Senn	2013-10-25	1	-21/+21
* \|	only warn on leaked time zone state instead of rasing an error.	Yves Senn	2013-10-25	1	-3/+6
* \|	Merge pull request #12633 from senny/no_more_time_zone_leaks	Yves Senn	2013-10-25	12	-214/+223
\|\ \ \| \|/ \|/\|
\| *	prevent global timezone state from leaking out of test cases.	Yves Senn	2013-10-25	12	-214/+223
* \|	`ActiveRecord::Store` works together with PG `hstore` columns.	Yves Senn	2013-10-25	1	-0/+21
* \|	`stored_attributes` need to be specific to a subclass.	Yves Senn	2013-10-25	1	-0/+12
* \|	test to verify the `ActiveRecord::Store` behavior with PG's json type	Yves Senn	2013-10-25	1	-0/+18
* \|	Merge pull request #12621 from laurocaetano/fix_has_one_association_with_prim...	Rafael Mendonça França	2013-10-24	1	-0/+11
\|\ \ \| \|/ \|/\|
\| *	Save association when primary key is manually set	laurocaetano	2013-10-24	1	-0/+11
* \|	Fix order dependent tests	Rafael Mendonça França	2013-10-22	1	-4/+4
* \|	Merge branch 'master' into joindep	Aaron Patterson	2013-10-21	7	-10/+80
\|\ \
\| * \	Merge pull request #12588 from jetthoughts/12586_subquery_with_unprepared_sql	Rafael Mendonça França	2013-10-21	2	-4/+38
\| \|\ \
\| \| * \|	Process sub-query relation's binding values	Paul Nikitochkin	2013-10-20	2	-4/+38
\| \| \|/
\| * \|	Escape the parentheses in the default function regexp	Rafael Mendonça França	2013-10-21	1	-0/+5
\| * \|	Fix loading a sql structure file on postgres when the file's path has whitesp...	Kevin Mook	2013-10-21	1	-0/+7
\| * \|	remove trailing whitespace added with b057765 [ci skip].	Yves Senn	2013-10-21	1	-2/+2
\| * \|	Allow unscope to work with `where.not`	Eric Hankins	2013-10-21	1	-6/+14
\| * \|	Raise an exception when model without primary key calls .find_with_ids	Shimpei Makimoto	2013-10-21	1	-0/+7
\| \|/
\| *	Convert Fixnum into String the port number in MySQL	Kenta Okamoto	2013-10-18	1	-0/+9
* \|	Merge branch 'master' into joindep	Aaron Patterson	2013-10-15	1	-1/+1
\|\\|
\| *	Pluck on NullRelation accepts a list of columns	Derek Prior	2013-10-15	1	-1/+1
* \|	Merge branch 'master' into joindep	Aaron Patterson	2013-10-15	8	-8/+61
\|\\|
\| *	scope_chain should not be mutated for other reflections	Neeraj Singh	2013-10-14	1	-0/+16
\| *	Merge pull request #9499 from dmitry/inverse_instance_should_not_be_reloaded_...	Rafael Mendonça França	2013-10-14	1	-0/+12
\| \|\
\| \| *	inversed instance should not be reloaded after stale state was changed	Dmitry Polushkin	2013-10-13	1	-0/+12
\| * \|	Dump the default function when the primary key is uuid	Rafael Mendonça França	2013-10-14	1	-2/+2
\| \|/
\| *	Merge pull request #12518 from vipulnsward/remove_count_options	Rafael Mendonça França	2013-10-13	1	-1/+1
\| \|\
\| \| *	Stop accepting `options` for `Relation#average`, `Relation#minimum`, `Relatio...	Vipul A M	2013-10-14	1	-1/+1
\| * \|	Merge pull request #12508 from jetthoughts/12415_generate_subqueries_for_rela...	Rafael Mendonça França	2013-10-13	2	-0/+11
\| \|\ \
\| \| * \|	Generate subquery for Relation passed as array condition for where	Paul Nikitochkin	2013-10-13	2	-0/+11
\| * \| \|	Merge pull request #12456 from razielgn/ar-test-fixes	Rafael Mendonça França	2013-10-13	3	-5/+11
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	Allow methods arity below -1 in assert_responds.	Federico Ravasio	2013-10-08	1	-3/+4
\| \| * \|	Assert presence of "frozen" in error message, not the full MRI message.	Federico Ravasio	2013-10-08	1	-1/+3
\| \| * \|	Just change ENV and restore it afterwards.	Federico Ravasio	2013-10-07	1	-1/+4
\| * \| \|	Merge pull request #11791 from versioncontrol/includes_with_persistent_select	Rafael Mendonça França	2013-10-12	1	-0/+8
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	Fixes #11773 when using includes combined with select, the select statement w...	Edo Balvers	2013-10-08	1	-0/+8
\| \| \|/
* \| /	this method does not exist anymore	Aaron Patterson	2013-10-14	1	-8/+0
\|/ /
* \|	Merge branch 'builder-instances'	Rafael Mendonça França	2013-10-09	1	-2/+1
\|\ \
\| * \|	Define the association extensions without need to have a builder	Rafael Mendonça França	2013-10-09	1	-2/+1
\| \|/
* /	Using flat_map instead of map and flatten	Arun Agrawal	2013-10-09	1	-1/+1
\|/
*	log the statement name along with the SQL	Aaron Patterson	2013-10-04	2	-0/+13
*	rm LogIntercepter	Aaron Patterson	2013-10-04	1	-15/+0
*	stop adding singleton methods to the SQLite3 connection	Aaron Patterson	2013-10-04	1	-11/+11
*	stop adding singleton methods to the mysql2 adapter	Aaron Patterson	2013-10-04	3	-22/+22
*	stop adding singleton methods to the PG connection	Aaron Patterson	2013-10-04	1	-11/+26
*	add regression test for set_inverse_instance on add_to_target	Arthur Neves	2013-10-04	1	-0/+13
*	Port test from cf1904f to avoid future regression	Prem Sichanugrist	2013-10-03	1	-1/+5
*	preheat habtm column cache	Aaron Patterson	2013-10-02	1	-0/+1