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

	Commit message (Expand)	Author	Age	Files	Lines
*	Refactor serialization test for hash order	Guillermo Iguaran	2013-08-18	1	-7/+6
*	Merge pull request #11926 from Empact/respond-with-csv	José Valim	2013-08-18	5	-587/+631
\|\
\| *	Fail informatively in #respond_with when no appropriate #api_behavior rendere...	Ben Woosley	2013-08-17	3	-0/+44
\| *	Split the 1200+ line mime_responds_test into 3 more focused and manageable te...	Ben Woosley	2013-08-17	3	-587/+587
* \|	Merge pull request #11812 from gaurish/json-order	Guillermo Iguaran	2013-08-17	1	-1/+7
\|\ \ \| \|/ \|/\|
\| *	Avoid Skip in test, have a unified test for order	Gaurish Sharma	2013-08-09	1	-10/+7
\| *	Add tests for ActiveModel::Serializers::JSON#as_json ordering	Gaurish Sharma	2013-08-09	1	-1/+10
* \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2013-08-17	35	-88/+131
\|\ \
\| * \|	Revert "Merge branch 'master' of github.com:rails/docrails"	Vijay Dev	2013-08-17	39	-115/+120
\| * \|	[getting started] Don't define resources :posts a second time + clarify messa...	Ryan Bigg	2013-08-16	1	-14/+4
\| * \|	Added new line [ci skip]	Rashmi Yadav	2013-08-14	1	-0/+1
\| * \|	Added docs for 'remove' method [ci skip]	Rashmi Yadav	2013-08-14	1	-0/+11
\| * \|	Merge branch 'master' of github.com:rails/docrails	Thiago Pinto	2013-08-14	39	-120/+115
\| \|\ \
\| \| * \|	Minor align BR tags with HTML void - with reference to the generators code ch...	AvnerCohen	2013-08-07	2	-2/+2
\| \| * \|	Revert "Removing obsolete html tags in favor of markdown code block"	Avner Cohen	2013-08-06	3	-52/+52
\| \| * \|	Removing obsolete html tags in favor of markdown code block.	Avner Cohen	2013-08-06	3	-52/+52
\| \| * \|	Added Action View in 'rake about' [ci skip]	Arun Agrawal	2013-08-02	1	-5/+6
\| * \| \|	guides should tell people to write ruby code, not output	Thiago Pinto	2013-08-14	1	-0/+7
* \| \| \|	Merge pull request #11920 from dlam/patch-1	Santiago Pastorino	2013-08-17	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fixed grammar error in ordered_options documention.	Dustin Lam	2013-08-17	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #11059 from robin850/improve-test-guide	Xavier Noria	2013-08-16	1	-6/+64
\|\ \ \ \
\| * \| \| \|	Improve the testing guide [ci skip]	Robin Dupret	2013-06-25	1	-6/+64
* \| \| \| \|	Merge pull request #11910 from brendon/master	Carlos Antonio da Silva	2013-08-16	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Use binary mode to write uploaded files [ci skip] See: http://stackoverflow.c...	Brendon Muir	2013-08-16	1	-1/+1
\|/ / / / /
* \| \| \| \|	fix build error caused by #11900.	Yves Senn	2013-08-15	1	-1/+1
* \| \| \| \|	Merge pull request #11900 from onlymejosh/add_less_to_rake_todos	Yves Senn	2013-08-15	3	-1/+7
\|\ \ \ \ \
\| * \| \| \| \|	Adding LESS to rake notes	Josh Crowder	2013-08-15	3	-1/+7
\|/ / / / /
* \| \| \| \|	Merge pull request #11897 from wangjohn/fixing_multiple_word_inverse_detection	José Valim	2013-08-14	4	-2/+19
\|\ \ \ \ \
\| * \| \| \| \|	Fixing multi-word automatic inverse detection.	wangjohn	2013-08-15	4	-2/+19
\|/ / / / /
* \| \| \| \|	Merge pull request #11887 from raysrashmi/typo_fix	Carlos Antonio da Silva	2013-08-14	1	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	Typo Fix[ci skip]	Rashmi Yadav	2013-08-14	1	-3/+3
\|/ / / / /
* \| \| \| \|	Merge pull request #11574 from jetthoughts/11552_rescue_on_invalid_inet_assign	Yves Senn	2013-08-14	3	-1/+37
\|\ \ \ \ \
\| * \| \| \| \|	Rescue invalid ip address exceptions on assign.	Paul Nikitochkin	2013-08-14	3	-1/+37
* \| \| \| \| \|	Merge pull request #11886 from jetthoughts/remove_redundant_assert_from_datat...	Yves Senn	2013-08-14	1	-28/+28
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Removed redundant asserts for assigns attribute operation	Paul Nikitochkin	2013-08-14	1	-28/+28
\|/ / / / /
* \| \| \| \|	document `assert_not_XYZ` in place of `refute_XYZ`.	Yves Senn	2013-08-14	1	-10/+10
* \| \| \| \|	Merge pull request #11617 from swooop/doc_sanitize	Xavier Noria	2013-08-14	1	-0/+66
\|\ \ \ \ \
\| * \| \| \| \|	Added SanitizeHelper to rails guide docs [ci skip]	Toby Sims	2013-07-29	1	-0/+66
* \| \| \| \| \|	Merge pull request #11544 from prathamesh-sonpatki/namespaced_routes_test	Yves Senn	2013-08-14	3	-1/+58
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Generate namespaced routes correctly for generators. Fix for #11532	Prathamesh Sonpatki	2013-08-14	3	-1/+58
* \| \| \| \| \| \|	test-case for fixed issue #11870.	Yves Senn	2013-08-14	1	-0/+4
* \| \| \| \| \| \|	Merge pull request #11756 from zilkey/master	Yves Senn	2013-08-13	1	-0/+13
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	added String#to_date documentation to Rails 4 upgrade guide	Jeff Dean	2013-08-06	1	-0/+13
* \| \| \| \| \| \|	Merge pull request #11807 from jetthoughts/11804_actions_are_public_methods	Steve Klabnik	2013-08-13	1	-0/+4
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	#11804: Add description of action in Getting Started Guide	Paul Nikitochkin	2013-08-13	1	-0/+4
* \| \| \| \| \| \| \|	Merge pull request #11847 from AJ-Acevedo/master	Steve Klabnik	2013-08-13	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Updated outdated initialization guide [ci skip]	AJ Acevedo	2013-08-13	1	-1/+1
* \| \| \| \| \| \| \| \|	Add String#remove(pattern) as a short-hand for the common pattern of String#g...	David Heinemeier Hansson	2013-08-13	3	-0/+19
\| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #11868 from rajcybage/fix_refute	Rafael Mendonça França	2013-08-13	2	-4/+4
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	using assert_not instead of refute	Rajarshi Das	2013-08-13	2	-4/+4
\|/ / / / / / / /