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

	Commit message (Expand)	Author	Age	Files	Lines
*	Added test for empty CDATA bug in from_xml	Bradley Harris	2011-04-29	1	-2/+8
*	Merged pull request #344 from asanghi/callback_if.	José Valim	2011-04-28	3	-3/+17
\|\
\| *	fix typo	Aditya Sanghi	2011-04-29	1	-1/+1
\| *	:if should not fire on validations when not in context with :on	Aditya Sanghi	2011-04-29	3	-3/+17
\|/
*	Merge remote branch 'myron/am_disabling_fix_memory_leaks'	José Valim	2011-04-28	3	-56/+155
\|\
\| *	Add additional tests for AM::ObserverArray that I had missed yesterday.	Myron Marston	2011-04-28	1	-1/+50
\| *	Fix bug with AM::Observer disablement.	Myron Marston	2011-04-28	3	-25/+27
\| *	Fix dev env memory leaks by using AS::DescendantsTracker rather than keeping ...	Myron Marston	2011-04-28	2	-36/+12
\| *	Revert "Revert "Handle enabling/disabling observers at different levels of th...	Myron Marston	2011-04-28	3	-3/+75
* \|	clearing statement from cache on exception in order to support older versions...	Aaron Patterson	2011-04-28	1	-3/+13
\|/
*	Merged pull request #327 from dcrec1/master.	José Valim	2011-04-28	2	-3/+17
\|\
\| *	added a :prefix option to number_to_human_size	Diego Carrion	2011-04-27	2	-3/+17
* \|	Merged pull request #336 from neerajdotname/upgrade_rack_mount.	José Valim	2011-04-28	1	-1/+1
\|\ \
\| * \|	upgrade rack-mount	Neeraj Singh	2011-04-28	1	-1/+1
\|/ /
* \|	Tidy up previous commit.	José Valim	2011-04-28	1	-3/+8
* \|	Merged pull request #219 from panthomakos/memcache.	José Valim	2011-04-28	2	-1/+42
\|\ \
\| * \|	Fixed special character encoding issue with MemCacheStore in Ruby 1.9.2.	Pan Thomakos	2011-03-11	2	-1/+42
* \| \|	Merged pull request #333 from jgarber/master.	José Valim	2011-04-28	2	-2/+13
\|\ \ \
\| * \| \|	Allow a label with the value option to have value-specific translations.	Jason Garber	2011-04-27	2	-2/+13
* \| \| \|	Revert "Handle enabling/disabling observers at different levels of the class ...	José Valim	2011-04-28	3	-75/+3
* \| \| \|	Merged pull request #328 from MSNexploder/fix_clear_inflector.	José Valim	2011-04-28	2	-13/+31
\|\ \ \ \
\| * \| \| \|	proper reset all inflector scopes	Stefan Huber	2011-04-25	2	-13/+31
* \| \| \| \|	Handle enabling/disabling observers at different levels of the class hierarchy.	Myron Marston	2011-04-28	3	-3/+75
* \| \| \| \|	Allow observers to be enabled and disabled.	Myron Marston	2011-04-28	5	-3/+276
* \| \| \| \|	Wrap line that is over 200 characters long. Now it's much easier to read.	Myron Marston	2011-04-28	1	-1/+5
\| \|/ / / \|/\| \| \|
* \| \| \|	requiring a newer version of the mysql2 gem	Aaron Patterson	2011-04-27	2	-1/+2
\| \|_\|/ \|/\| \|
* \| \|	Merged pull request #325 from joshk/mass_assignment_tests_fixed.	Aaron Patterson	2011-04-27	1	-7/+7
\|\ \ \
\| * \| \|	some test renaming to avoid collisions, and some annoying issues between dbs	Josh Kalderimis	2011-04-27	1	-7/+7
\|/ / /
* \| \|	prevent errors when passing a frozen string as a param to ActionController::T...	misfo	2011-04-28	2	-1/+15
* \| \|	Merged pull request #325 from joshk/mass_assignment_tests_fixed.	Aaron Patterson	2011-04-27	1	-4/+4
\|\ \ \
\| * \| \|	final corrections to the mass-assignment security tests	Josh Kalderimis	2011-04-27	1	-4/+4
\|/ / /
* \| \|	Merged pull request #324 from joshk/fix_array_from.	Joshua Peek	2011-04-27	1	-1/+1
\|\ \ \
\| * \| \|	fixed a small bug with Array#from core_ext	Josh Kalderimis	2011-04-27	1	-1/+1
\|/ / /
* \| \|	Relevant options closer together	David Heinemeier Hansson	2011-04-27	1	-4/+4
* \| \|	minor git sources formatting change in railties app_base.rb	Josh Kalderimis	2011-04-27	1	-3/+3
* \| \|	using @tenderlove's suggested implementation to speed things up	Jared McFarland	2011-04-27	1	-1/+1
* \| \|	enable uglifier gem as new version of execjs is relased	Ganesh Kumar	2011-04-27	2	-2/+2
* \| \|	Merged pull request #319 from nusco/master.	Piotr Sarnacki	2011-04-26	1	-1/+1
\|\ \ \
\| * \| \|	Fixed minor typo in comment	Paolo "Nusco" Perrotta	2011-04-26	1	-1/+1
\|/ / /
* \| \|	Merged pull request #318 from joshk/fix_tests.	Aaron Patterson	2011-04-26	2	-15/+15
\|\ \ \
\| * \| \|	fix mass-assignment security tests, this was due to a string column limit whi...	Josh Kalderimis	2011-04-27	2	-15/+15
\|/ / /
* \| \|	Merged pull request #317 from jaredonline/master.	David Heinemeier Hansson	2011-04-26	2	-3/+3
\|\ \ \
\| * \| \|	fixing Array#from to return consistent results	Jared McFarland	2011-04-26	2	-3/+3
\|/ / /
* \| \|	Merged pull request #313 from chadk/master.	David Heinemeier Hansson	2011-04-26	2	-2/+17
\|\ \ \
\| * \| \|	moving check fo scheme-relative URI into is_uri?	Chad Krsek	2011-04-26	1	-9/+2
\| * \| \|	asset helpers should understand scheme-relative URLs	Chad Krsek	2011-04-26	2	-2/+24
\| * \| \|	Revert "asset helpers should understand scheme-relative URLs"	Chad Krsek	2011-04-25	2	-24/+2
\| * \| \|	asset helpers should understand scheme-relative URLs	Chad Krsek	2011-04-25	2	-2/+24
* \| \| \|	Prem fixes 1.9 engine test issue	David Heinemeier Hansson	2011-04-26	1	-1/+1
* \| \| \|	Merged pull request #279 from miloops/434d757.	José Valim	2011-04-26	1	-1/+1
\|\ \ \ \