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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|/ / / /
* \| \| \|	Merge pull request #12545 from nateberkopec/rephrase_callback_warning	Yves Senn	2013-10-16	1	-1/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Rephrase ActiveRecord transaction rollback warning	Nate Berkopec	2013-10-16	1	-1/+1
* \| \| \|	Merge pull request #12558 from lucasmazza/changelog-fixes	Rafael Mendonça França	2013-10-16	2	-12/+12
\|\ \ \ \
\| * \| \| \|	Fix code blocks identation on AR and AS CHANGELOGs	Lucas Mazza	2013-10-16	2	-12/+12
\|/ / / /
* \| \| \|	Merge pull request #12553 from tchandy/master	Guillermo Iguaran	2013-10-15	1	-95/+0
\|\ \ \ \
\| * \| \| \|	Removing unused fake models from actionpack tests	Thiago Pradi	2013-10-16	1	-95/+0
\|/ / / /
* \| \| \|	use the cached arel table	Aaron Patterson	2013-10-15	2	-2/+2
* \| \| \|	Fix typo in the changelog entry	Rafael Mendonça França	2013-10-15	1	-1/+1
* \| \| \|	Don't remove the select values to add they back again	Rafael Mendonça França	2013-10-15	1	-1/+1
* \| \| \|	Merge pull request #12547 from derekprior/dp-fix-null-relation-pluck	Rafael Mendonça França	2013-10-15	3	-2/+9
\|\ \ \ \
\| * \| \| \|	Pluck on NullRelation accepts a list of columns	Derek Prior	2013-10-15	3	-2/+9
\| \|/ / /
* \| \| \|	grammar fix (reverted in e9a1ecd)	Vijay Dev	2013-10-15	1	-1/+1
* \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2013-10-15	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Revert "fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no lon...	Vijay Dev	2013-10-15	1	-1/+1