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

	Commit message (Expand)	Author	Age	Files	Lines
*	Revert "Revert the merge because tests did not pass."	José Valim	2011-05-07	3	-5/+44
*	Update CHANGELOG.	José Valim	2011-05-07	1	-0/+2
*	Merge pull request #343 from asanghi/ampm	José Valim	2011-05-07	2	-4/+85
\|\
\| *	DRY this baby up	Aditya Sanghi	2011-04-29	1	-23/+4
\| *	add more documentation; remove unused assignment	Aditya Sanghi	2011-04-29	1	-4/+14
\| *	Allow AM/PM in datetime selectors	Aditya Sanghi	2011-04-29	2	-0/+90
* \|	Merge pull request #286 from jasoncodes/marshal_subsec	José Valim	2011-05-07	2	-0/+8
\|\ \
\| * \|	Fix marshal round-tripping of fractional seconds (Time#subsec).	Jason Weathered	2011-04-17	2	-0/+8
* \| \|	ADdd missing requires (thanks to @arunagw)	José Valim	2011-05-07	2	-1/+2
* \| \|	Merge pull request #280 from jballanc/frozen-string-strip-tags	José Valim	2011-05-07	2	-1/+2
\|\ \ \
\| * \| \|	Fix for stripping tags from frozen strings.	Joshua Ballanco	2011-04-14	1	-1/+1
\| * \| \|	Test for stripping tags from a frozen string.	Joshua Ballanco	2011-04-14	1	-0/+1
* \| \| \|	Merge pull request #275 from pk-amooma/master	José Valim	2011-05-07	2	-2/+14
\|\ \ \ \
\| * \| \| \|	test "Escapes special HTML/XML characters" do ...	Philipp Kempgen	2011-04-26	1	-0/+12
\| * \| \| \|	for escaping HTML can be treated as normal XML	Philipp Kempgen (Amooma)	2011-04-14	1	-2/+2
\| * \| \| \|	properly escape "'" to "'" for XML/HTML (BTW Erubis does that as well)	Philipp Kempgen (Amooma)	2011-04-14	1	-2/+2
* \| \| \| \|	Merge pull request #263 from CvX/master	José Valim	2011-05-07	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Corrected dbconsole usage message.		2011-04-12	1	-1/+1
* \| \| \| \| \|	Merge remote branch 'rolftimmermans/desc_tracker'	José Valim	2011-05-07	7	-34/+64
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into desc_tracker	Rolf Timmermans	2011-03-27	137	-788/+2315
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Revert "Revert "It should be possible to use ActiveSupport::DescendantTracker...	Rolf Timmermans	2011-03-13	1	-7/+9
\| * \| \| \| \| \| \|	Refactored AS::DescendantsTracker test cases so they can be tested without AS...	Rolf Timmermans	2011-03-13	3	-27/+52
\| * \| \| \| \| \| \|	Missing dependency in MultiByte test.	Rolf Timmermans	2011-03-13	1	-0/+1
\| * \| \| \| \| \| \|	Add missing dependency string inflection test.	Rolf Timmermans	2011-03-13	1	-0/+1
\| * \| \| \| \| \| \|	Missing dependency for duration test.	Rolf Timmermans	2011-03-13	1	-0/+1
* \| \| \| \| \| \| \|	Merge pull request #248 from bigfix/enumerable_as_json	José Valim	2011-05-07	2	-10/+27
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Enumerable should pass encoding options to children in #as_json/#to_json.	John Firebaugh	2011-04-01	2	-10/+27
* \| \| \| \| \| \| \| \|	Merge pull request #349 from bradley178/master	José Valim	2011-05-07	2	-3/+10
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Fix bug with empty CDATA not being handled in Hash.from_xml	Bradley Harris	2011-04-29	2	-3/+4
\| * \| \| \| \| \| \| \| \|	Added test for empty CDATA bug in from_xml	Bradley Harris	2011-04-29	1	-2/+8
* \| \| \| \| \| \| \| \| \|	Use .ref instead of .to_sym.	José Valim	2011-05-07	2	-2/+4
* \| \| \| \| \| \| \| \| \|	adds comments clarifying the role of SharedGeneratorTests	Xavier Noria	2011-05-07	3	-0/+7
* \| \| \| \| \| \| \| \| \|	Merge pull request #424 from gnufied/master	José Valim	2011-05-06	2	-2/+27
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	fix yield not working from around filter of observers, fixes Github#329	Hemant Kumar	2011-05-07	2	-2/+27
* \| \| \| \| \| \| \| \| \| \|	Revert the merge because tests did not pass.	José Valim	2011-05-06	3	-44/+5
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #423 from richardiux/master	José Valim	2011-05-06	3	-5/+44
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Adding base method symbolized_sti_name to activerecord base to be used on ide...	Richard Millan	2011-05-06	3	-9/+15
\| * \| \| \| \| \| \| \| \| \| \|	Test: identity on inherited classes should behave the same when turned on or off	Richard Millan	2011-05-05	1	-0/+16
\| * \| \| \| \| \| \| \| \| \| \|	Testing identity map on inherited active record classes. Distinct models tha...	Richard Millan	2011-05-05	1	-0/+17
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #419 from smartinez87/avail_action	José Valim	2011-05-06	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	better styling on #available_action? docs	Sebastian Martinez	2011-05-06	1	-2/+2
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #418 from myronmarston/am_observer_doc_updates	Aaron Patterson	2011-05-06	3	-3/+53
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add documentation for new observer enable/disable feature.	Myron Marston	2011-05-06	3	-3/+53
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Revert to old semantics, use available_action? instead of action_method?.	José Valim	2011-05-06	4	-28/+38
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #389 from jasonrudolph/always_flush_logger_at_exit	José Valim	2011-05-06	3	-14/+22
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Add test to verify production rake tasks flush logger on exit	Jason Rudolph	2011-05-06	1	-0/+13
\| * \| \| \| \| \| \| \| \| \| \|	Always flush logger at exit	Jason Rudolph	2011-05-06	2	-14/+9
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #414 from asanghi/lh5796	José Valim	2011-05-06	4	-12/+20
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	be consistent	Aditya Sanghi	2011-05-06	1	-3/+1
\| * \| \| \| \| \| \| \| \| \| \|	review fixes	Aditya Sanghi	2011-05-06	3	-6/+11