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

	Commit message (Expand)	Author	Age	Files	Lines
*	build the association graph functionally	Aaron Patterson	2013-10-21	3	-20/+13
*	Merge branch 'master' into joindep	Aaron Patterson	2013-10-21	26	-244/+418
\|\
\| *	Merge pull request #12588 from jetthoughts/12586_subquery_with_unprepared_sql	Rafael Mendonça França	2013-10-21	4	-6/+56
\| \|\
\| \| *	Process sub-query relation's binding values	Paul Nikitochkin	2013-10-20	4	-4/+54
\| * \|	Escape the parentheses in the default function regexp	Rafael Mendonça França	2013-10-21	2	-1/+6
\| * \|	Merge pull request #12567 from GoBoundless/fix_postgres_structure_import	Yves Senn	2013-10-21	3	-1/+13
\| \|\ \
\| \| * \|	Fix loading a sql structure file on postgres when the file's path has whitesp...	Kevin Mook	2013-10-21	3	-1/+13
\| * \| \|	Merge pull request #12603 from dv/fix-tilt-template-in-asset-pipeline-docs	Guillermo Iguaran	2013-10-21	1	-3/+8
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Update docs on Tilt::Template in Asset Pipeline guide	David Verhasselt	2013-10-21	1	-3/+8
\| \|/ /
\| * \|	remove trailing whitespace added with b057765 [ci skip].	Yves Senn	2013-10-21	1	-2/+2
\| * \|	Merge pull request #12565 from stormsilver/unscope_fixes	Yves Senn	2013-10-21	3	-7/+23
\| \|\ \
\| \| * \|	Allow unscope to work with `where.not`	Eric Hankins	2013-10-21	3	-7/+23
\| \|/ /
\| * \|	Merge pull request #12549 from makimoto/raise-when-find-without-pk	Yves Senn	2013-10-21	3	-0/+13
\| \|\ \
\| \| * \|	Raise an exception when model without primary key calls .find_with_ids	Shimpei Makimoto	2013-10-21	3	-0/+13
\| \|/ /
\| * \|	Merge pull request #12591 from vipulnsward/remove_mail_merge	Yves Senn	2013-10-20	1	-3/+3
\| \|\ \
\| \| * \|	Remove extra variable creation and merge.	Vipul A M	2013-10-20	1	-3/+3
\| * \| \|	Merge pull request #12556 from dasch/dasch/nstrument-am-processing	José Valim	2013-10-20	4	-7/+29
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Instrument the generation of Action Mailer messages	Daniel Schierbeck	2013-10-20	4	-7/+29
\| \|/ /
\| * \|	Merge pull request #12533 from szimek/use_exists_in_relation_empty	Santiago Pastorino	2013-10-19	2	-2/+5
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	In Relation#empty? use #exists? instead of #count.	Szymon Nowak	2013-10-19	2	-2/+5
\| \|/
\| *	Merge pull request #12560 from sue445/modify_find_lock_sample_code	Yves Senn	2013-10-18	1	-3/+3
\| \|\
\| \| *	[ci skip] avoid deprecation warning in sample code	sue445	2013-10-18	1	-3/+3
\| * \|	Merge pull request #11839 from chocoby/fix/convert_port_number	Yves Senn	2013-10-18	3	-1/+15
\| \|\ \
\| \| * \|	Convert Fixnum into String the port number in MySQL	Kenta Okamoto	2013-10-18	3	-1/+15
\| \|/ /
\| * \|	Merge pull request #12569 from arthurnn/autosave_small_cleanip	Rafael Mendonça França	2013-10-17	1	-196/+196
\| \|\ \
\| \| * \|	Fix some indentation on autosave association	Arthur Neves	2013-10-17	1	-196/+196
\| \| * \|	Make define_non_cyclic_method simpler	Arthur Neves	2013-10-17	1	-7/+7
\| * \| \|	Merge pull request #12218 from dv/add-sass-globbing-to-asset-pipeline-docs	Yves Senn	2013-10-17	1	-1/+5
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Add Sass gobbling info to asset pipeline docs	David Verhasselt	2013-10-17	1	-1/+5
\| * \| \|	Merge pull request #12564 from JuanitoFatas/association-basics	Yves Senn	2013-10-16	1	-8/+8
\| \|\ \ \
\| \| * \| \|	[ci skip] Fix number of methods added by association.	Juanito Fatas	2013-10-17	1	-8/+8
\| * \| \| \|	Ensure the state is clean after one failure	Rafael Mendonça França	2013-10-16	1	-5/+4
\| * \| \| \|	Merge pull request #12540 from wyaeld/bug/fix-recursive-digest	Rafael Mendonça França	2013-10-16	3	-6/+37
\| \|\ \ \ \
\| \| * \| \| \|	add a new local variable to track if digests are being stored, to ensure the ...	Brad Murray	2013-10-17	1	-2/+2
\| \| * \| \| \|	update digestor code based on review	Brad Murray	2013-10-15	1	-2/+2
\| \| * \| \| \|	update changelog	Brad Murray	2013-10-15	1	-0/+5
\| \| * \| \| \|	Ensure ActionView::Digest.cache is correctly cleaned up when	Brad Murray	2013-10-15	1	-6/+6
\| \| * \| \| \|	Add 2 tests, 1 of which fails, to isolate the digest_caching behaviour causin...	Brad Murray	2013-10-15	1	-0/+26
\| * \| \| \| \|	Merge pull request #12568 from adamyonk/patch-1	Rafael Mendonça França	2013-10-16	1	-1/+1
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| \| * \| \| \|	Fix typo in form_helper.rb	Adam Jahnke	2013-10-16	1	-1/+1
\| \|/ / / /
* \| \| \| \|	@base_klass is not used	Aaron Patterson	2013-10-21	1	-1/+0
* \| \| \| \|	join_type isn't used on the node anymore	Aaron Patterson	2013-10-21	2	-11/+7
* \| \| \| \|	make joins generation method look similar	Aaron Patterson	2013-10-21	1	-6/+9
* \| \| \| \|	remove node duping code	Aaron Patterson	2013-10-21	1	-57/+19
* \| \| \| \|	refactor outer join generation	Aaron Patterson	2013-10-21	1	-11/+6
* \| \| \| \|	add outer joins for matching nodes	Aaron Patterson	2013-10-21	1	-2/+14
* \| \| \| \|	construct joins by walking the outer join tree	Aaron Patterson	2013-10-21	1	-5/+34
* \| \| \| \|	pass the outer joins to join_constraints	Aaron Patterson	2013-10-20	2	-6/+3
* \| \| \| \|	disconnect join_constraints from the instance	Aaron Patterson	2013-10-20	2	-3/+3
* \| \| \| \|	pass in scope chain so reflection is not needed	Aaron Patterson	2013-10-20	2	-3/+3