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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:lifo/docrails	aditya-kapoor	2013-09-01	301	-2671/+3921
\|\
\| *	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2013-08-31	4	-12/+18
\| \|\
\| \| *	Fix typos [ci skip]	Carlos Antonio da Silva	2013-08-30	1	-2/+2
\| \| *	Add documentation for rake db:setup task	Jay Hayes	2013-08-29	1	-0/+5
\| \| *	Note functional equivalence in reset task	Jay Hayes	2013-08-29	1	-2/+2
\| \| *	Fix doc for singularize - `pluralized` => `singularized`	Vipul A M	2013-08-27	1	-1/+1
\| \| *	Document ability to run a single test.	wangjohn	2013-08-21	1	-1/+8
\| \| *	Removing merge conflict remnants in the guides.	wangjohn	2013-08-21	1	-6/+0
\| \| *	Moved "`mod_expires` to be enabled" to new line.	Prathamesh Sonpatki	2013-08-21	1	-2/+2
\| * \|	Merge pull request #12085 from valk/master	Santiago Pastorino	2013-08-30	1	-1/+3
\| \|\ \
\| \| * \|	FIX reload! within rails console --sandbox causes undefined method rollback u...	Val Kotlarov Hoffman	2013-08-30	1	-1/+3
\| * \| \|	add missing fixtures file	Aaron Patterson	2013-08-30	1	-1/+2
\| \|/ /
\| * \|	Merge pull request #12078 from prathamesh-sonpatki/typo	Guillermo Iguaran	2013-08-29	1	-1/+1
\| \|\ \
\| \| * \|	Fix typo in generators test helpr -> helper [ci skip]	Prathamesh Sonpatki	2013-08-30	1	-1/+1
\| \|/ /
\| * \|	Merge pull request #12076 from dabit/master	Carlos Antonio da Silva	2013-08-29	3	-3/+3
\| \|\ \
\| \| * \|	Fix broken link to Fixtures documentation on guides	David Padilla	2013-08-29	3	-3/+3
\| * \| \|	Stop messing up with instance variables, use protected as it was meant for	Carlos Antonio da Silva	2013-08-30	1	-2/+7
\| * \| \|	Remove not necessary AR changelog entry, fix markup [ci skip]	Carlos Antonio da Silva	2013-08-30	1	-6/+1
\| * \| \|	make sure there are actually some categories when running the test	Aaron Patterson	2013-08-29	1	-0/+1
\| * \| \|	pk should not be required for hm:t associations	Aaron Patterson	2013-08-29	3	-1/+15
\| \|/ /
\| * \|	Merge pull request #12062 from strzalek/default-protected-vars	José Valim	2013-08-29	5	-19/+21
\| \|\ \
\| \| * \|	Port all remaining self.protected_instance_variables to class methods	Łukasz Strzałkowski	2013-08-29	5	-19/+21
\| * \| \|	Merge pull request #12051 from bcherry/preserve_datetime_milliseconds	Andrew White	2013-08-28	2	-0/+9
\| \|\ \ \
\| \| * \| \|	Test that PostgreSQL adapter includes `usec` when quoting `DateTime`	Ben Cherry	2013-08-28	2	-0/+9
\| * \| \| \|	Merge branch 'typecast'	Aaron Patterson	2013-08-28	2	-18/+31
\| \|\ \ \ \
\| \| * \| \| \|	correctly typecast keys, remove conditionals, reduce object allocations	Aaron Patterson	2013-08-28	2	-7/+11
\| \| * \| \| \|	no need to to_a the scope	Aaron Patterson	2013-08-28	1	-1/+1
\| \| * \| \| \|	remove extra flat_map array	Aaron Patterson	2013-08-28	1	-8/+9
\| \| * \| \| \|	avoid extra empty array allocation	Aaron Patterson	2013-08-28	1	-10/+10
\| \| * \| \| \|	extract owner id calculation to a method	Aaron Patterson	2013-08-28	1	-1/+5
\| \| * \| \| \|	only call to_a when we have to	Aaron Patterson	2013-08-28	2	-2/+6
\| * \| \| \| \|	Merge pull request #12061 from wangjohn/refactoring_generators_base	Rafael Mendonça França	2013-08-28	1	-14/+17
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Refactoring Generators::Base.	wangjohn	2013-08-28	1	-14/+17
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #12058 from gaurish/secure-pass-doc	Rafael Mendonça França	2013-08-28	1	-1/+3
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Add :nodoc: to ActiveModel::SecurePassword.min_cost	Gaurish Sharma	2013-08-29	1	-1/+3
\| * \| \| \| \| \|	Merge pull request #12053 from schuetzm/doc_sqlite3_mem	Yves Senn	2013-08-28	1	-0/+1
\| \|\\| \| \| \| \|
\| \| * \| \| \| \|	Mention the fast `test_sqlite3_mem` option in `RUNNING_UNIT_TESTS.rdoc` [ci s...	Marc Schütz	2013-08-28	1	-0/+1
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #12033 from alexaltair/patch-1	Yves Senn	2013-08-27	1	-1/+1
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Update Test::Unit to Minitest	Alex Altair	2013-08-27	1	-1/+1
\| * \| \| \| \|	use consistent keys between cache get / set	Aaron Patterson	2013-08-27	1	-1/+1
\| * \| \| \| \|	remove intermediate variable	Aaron Patterson	2013-08-27	1	-3/+1
\| * \| \| \| \|	cache association reset calculation	Aaron Patterson	2013-08-27	1	-4/+4
\| * \| \| \| \|	query the association rather than send the method for the association name	Aaron Patterson	2013-08-27	2	-11/+10
\| * \| \| \| \|	Merge pull request #12048 from tjouan/app_generator-bin_perms-umask	Aaron Patterson	2013-08-27	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Comply with current umask when generating new app:	Thibault Jouan	2013-08-27	1	-1/+1
\| \|/ / / /
\| * \| \| \|	Improve CHANGELOG entry [ci skip]	Rafael Mendonça França	2013-08-27	1	-4/+2
\| * \| \| \|	Merge pull request #11768 from cloudspace/cache_template_loading	Rafael Mendonça França	2013-08-27	3	-5/+24
\| \|\ \ \ \
\| \| * \| \| \|	Only cache template digests if config.cache_template_loading	Josh Lauer	2013-08-06	3	-5/+24
\| * \| \| \| \|	Merge pull request #11805 from jetthoughts/11803_update_move_forbidden_except...	Rafael Mendonça França	2013-08-27	1	-34/+36
\| \|\ \ \ \ \
\| \| * \| \| \| \|	#11803: Move Forbidden attributes description before show post section	Paul Nikitochkin	2013-08-27	1	-34/+36