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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #12135 from dylanahsmith/avoid_empty_transaction	Rafael Mendonça França	2013-09-11	3	-1/+10
\|\
\| *	Avoid empty transaction from setting has_one association on new record.	Dylan Thacker-Smith	2013-09-11	3	-1/+9
* \|	Whitespaces	Rafael Mendonça França	2013-09-11	1	-1/+2
* \|	Merge pull request #12185 from SamSaffron/join_dep	Rafael Mendonça França	2013-09-11	1	-1/+13
\|\ \
\| * \|	Reduce allocations when extracting AR models	Sam	2013-09-11	1	-1/+13
* \| \|	Merge pull request #12194 from thedarkone/readonly-merger-fix	Rafael Mendonça França	2013-09-11	3	-1/+17
\|\ \ \
\| * \| \|	Relation#merge should not lose readonly(false) flag.	thedarkone	2013-09-11	3	-1/+17
* \| \| \|	Revert "Add meta tag with charset information to application layout."	Aaron Patterson	2013-09-11	1	-1/+0
* \| \| \|	fix deleting join models with no pk	Aaron Patterson	2013-09-11	2	-6/+62
\| \|_\|/ \|/\| \|
* \| \|	Merge pull request #12199 from michaelminter/master	Rafael Mendonça França	2013-09-11	1	-1/+1
\|\ \ \
\| * \| \|	remove sentence err	michaelminter	2013-09-11	1	-1/+1
\|/ / /
* \| \|	Merge pull request #12184 from waynn/patch-4	Steve Klabnik	2013-09-10	1	-1/+1
\|\ \ \
\| * \| \|	[ci skip] 'previous version of Rails' is gramatically incorrect	Waynn Lue	2013-09-10	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Add meta tag with charset information to application layout.	Steve Klabnik	2013-09-10	1	-0/+1
* \| \|	add a comment for sanity of other people to come	Aaron Patterson	2013-09-10	1	-0/+8
* \| \|	ask the association for records rather than calling `send`	Aaron Patterson	2013-09-10	1	-1/+2
* \| \|	Merge pull request #12193 from arunagw/revert-revert	Rafael Mendonça França	2013-09-10	19	-41/+33
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Use Ruby 2.0 caller_locations instead of caller if available	Akira Matsuda	2013-09-10	1	-2/+7
\| * \|	Update Rails 3.2.x guide link [ci skip]	Tomas Varaneckas	2013-09-10	1	-1/+1
\| * \|	Be sure to restore the default I18n.locale after changed its value in a test	Akira Matsuda	2013-09-10	1	-3/+3
\| * \|	Fixes typo in Object#try!	Jay Hayes	2013-09-10	1	-1/+1
\| * \|	More unused associations in AR test models	Akira Matsuda	2013-09-10	8	-13/+0
\| * \|	:scissors: [ci skip]	Carlos Antonio da Silva	2013-09-10	1	-1/+1
\| * \|	change function def self.table_name to self.table_name	Rajarshi Das	2013-09-10	2	-5/+3
\| * \|	Clean up unused associations in AR test model	Akira Matsuda	2013-09-10	1	-3/+0
\| * \|	Reset ActionView::Base.logger instead of AC::Base.logger	Akira Matsuda	2013-09-10	1	-1/+1
\| * \|	Refactor handling of action normalization	Max Shytikov	2013-09-10	1	-11/+13
\| * \|	Don't mutate the Base settings by merge!ing the given value	Akira Matsuda	2013-09-10	2	-1/+4
\|/ /
* \|	Merge pull request #12189 from rajcybage/test_assert	Santiago Pastorino	2013-09-10	1	-7/+7
\|\ \
\| * \|	use assert_empty in activemodel conditional validation test cases	Rajarshi Das	2013-09-10	1	-7/+7
* \| \|	Merge pull request #12173 from arunagw/fixes_reverted_by_revert_commit	Guillermo Iguaran	2013-09-10	4	-11/+17
\|\ \ \
\| * \| \|	Back AV description in gemspec	Arun Agrawal	2013-09-09	1	-1/+1
\| * \| \|	Fix order dependent test	Arun Agrawal	2013-09-09	1	-2/+10
\| * \| \|	grab executable from rubygems	Arun Agrawal	2013-09-09	1	-1/+1
\| * \| \|	Fixed API task file	Arun Agrawal	2013-09-09	1	-7/+5
* \| \| \|	Make AC standalone rendering work	Santiago Pastorino	2013-09-10	2	-2/+20
\| \|/ / \|/\| \|
* \| \|	Merge pull request #12187 from anupamc/master	Carlos Antonio da Silva	2013-09-10	2	-8/+0
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Removed unused modules and classes	Anupam Choudhury	2013-09-10	1	-7/+0
\| * \|	Removed unnecessary require	Anupam Choudhury	2013-09-10	1	-1/+0
\|/ /
* \|	Merge pull request #12181 from claudiob/remove-unused-helper-fixtures	Carlos Antonio da Silva	2013-09-09	2	-4/+0
\|\ \
\| * \|	Remove helper fixtures not used in any test	claudiob	2013-09-09	2	-4/+0
* \| \|	let the class cache object clean up user input	Aaron Patterson	2013-09-09	1	-8/+20
* \| \|	make @bitsweat happy. :heart:	Aaron Patterson	2013-09-09	1	-0/+6
* \| \|	stop using deprecated api in the tests	Aaron Patterson	2013-09-09	1	-1/+1
\|/ /
* \|	Remove BasicRendering tests	José Valim	2013-09-09	3	-72/+1
* \|	Remove remaining coupling with AV in MimeResponds	José Valim	2013-09-09	4	-5/+20
* \|	Remove BasicRendering and remove template functionality from AbsC::Rendering	José Valim	2013-09-09	5	-47/+24
* \|	Merge pull request #12167 from hannesfostie/grammar-improvement	Steve Klabnik	2013-09-09	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	Improves a sentence in guides/security	Hannes Fostie	2013-09-09	1	-1/+1
* \|	Merge pull request #12157 from robin850/patch-9	Yves Senn	2013-09-09	1	-1/+1
\|\ \