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

	Commit message (Expand)	Author	Age	Files	Lines
*	Replace multi_json with json	Erik Michaels-Ober	2013-05-11	1	-23/+13
*	Merge pull request #10534 from cmaruz/master	Rafael Mendonça França	2013-05-10	1	-2/+2
\|\
\| *	Added escaping of U+2028 and U+2029 inside the json encoder.	Mario Caropreso	2013-05-09	1	-2/+2
* \|	remove redundant var	Vipul A M	2013-05-09	1	-1/+0
* \|	add test for object conditional with scope	Aaron Patterson	2013-05-08	1	-0/+19
* \|	adding a class conditional test	Aaron Patterson	2013-05-08	1	-0/+12
* \|	adding tests for lambdas as conditions	Aaron Patterson	2013-05-08	1	-0/+40
\|/
*	we need to indicate the type of callback	Aaron Patterson	2013-05-08	1	-2/+2
*	adding more tests around callback inconsistencies	Aaron Patterson	2013-05-08	1	-5/+47
*	refactor tests for more points	Aaron Patterson	2013-05-08	1	-4/+5
*	adding test to demonstrate inconsistencies in the AS::Callbacks api	Aaron Patterson	2013-05-08	1	-0/+41
*	Fix Typo existant -> existent [ci skip]	Prathamesh Sonpatki	2013-05-08	1	-1/+1
*	fix issue #10502, do not recompute method name for already-stringified object...	Sean Walbran	2013-05-07	1	-0/+22
*	Merge pull request #10234 from dasch/dasch/fetch-multi	Rafael Mendonça França	2013-05-06	1	-0/+20
\|\
\| *	Allow fetching multiple values from the cache at once	Daniel Schierbeck	2013-05-06	1	-0/+20
* \|	use nokogirisax as a backend	Anton Kalyaev	2013-05-05	1	-3/+3
* \|	Fixed bad tests to clean up after themselves.	Ryan Davis	2013-05-03	4	-6/+27
* \|	Squashed commit of the following:	Aaron Patterson	2013-05-03	6	-109/+0
\|/
*	Merge pull request #10412 from vipulnsward/fix_callback_test_typo	Carlos Antonio da Silva	2013-05-02	1	-1/+1
\|\
\| *	Fix typo in test	Vipul A M	2013-05-02	1	-1/+1
* \|	Fix failures in AS with minitest 4.7.4	Carlos Antonio da Silva	2013-05-01	1	-0/+3
* \|	Revert "Object#in? also accepts multiple parameters"	Brian Morearty	2013-05-01	1	-10/+0
\|/
*	Module#delegate checks nilness rather that falsehood if :allow_nil is true, a...	Xavier Noria	2013-04-26	1	-0/+31
*	Merge pull request #10351 from JonRowe/update_as_date_next_week_to_document_i...	Xavier Noria	2013-04-26	1	-0/+5
\|\
\| *	better document `next_week` functionaility closes #9568	Jon Rowe	2013-04-26	1	-0/+5
* \|	Delegation method bug	Li Ellis Gallardo	2013-04-25	1	-0/+5
\|/
*	Adjust for daylight savings in String#to_time	Andrew White	2013-04-23	1	-2/+118
*	Merge pull request #10096 from benofsky/fix_skipping_object_callback_filters	Rafael Mendonça França	2013-04-21	1	-0/+17
\|\
\| *	Fixes skipping object callback filters	Ben McRedmond	2013-04-04	1	-0/+17
* \|	more descriptive NameError's messages for class attributes	Hrvoje Šimić	2013-04-17	1	-4/+6
* \|	switch (and lazily convert) ivar names to 3.x	Sam Ruby	2013-04-16	1	-16/+15
* \|	refactor order hash test	Vipul A M	2013-04-11	1	-5/+1
* \|	Revert "Merge pull request #10158 from steveklabnik/issue_10125"	Rafael Mendonça França	2013-04-10	1	-17/+0
* \|	Removed unused setup	Anupam Choudhury	2013-04-10	1	-2/+0
* \|	Fixed typo	Anupam Choudhury	2013-04-10	1	-1/+1
* \|	Fix inflector to respect default locale.	Nick Cox	2013-04-10	1	-0/+17
* \|	Add option to Class#class_attribute for skipping the query method	Agis-	2013-04-06	1	-2/+7
* \|	Revert "Merge pull request #10034 from benofsky/fix_skipping_object_callback_...	Rafael Mendonça França	2013-04-04	1	-17/+0
* \|	Merge pull request #10034 from benofsky/fix_skipping_object_callback_filters	Rafael Mendonça França	2013-04-04	1	-0/+17
\|\ \
\| * \|	Fixes skipping object callback filters	Ben McRedmond	2013-04-04	1	-0/+17
\| \|/
* \|	Further simplify enumerable group_by test	Carlos Antonio da Silva	2013-04-04	1	-3/+1
* \|	Replaced inject with map	Anupam Choudhury	2013-04-04	1	-2/+2
* \|	Removed unused comma after loop variable	Anupam Choudhury	2013-04-04	1	-1/+1
* \|	Added missing assert	Anupam Choudhury	2013-04-02	6	-25/+37
\|/
*	fix some typos in AS	Vipul A M	2013-03-30	2	-13/+13
*	determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn]	Xavier Noria	2013-03-28	1	-0/+10
*	Merge pull request #9523 from stopdropandrew/Instrumenter#instrument-yields-p...	Rafael Mendonça França	2013-03-27	2	-1/+9
\|\
\| *	ActiveSupport::Notifications::Instrumenter#instrument should yield	stopdropandrew	2013-03-02	2	-1/+9
* \|	Fix warning: mismatched indentatmmismatched indentations at 'end' with 'def'	kennyj	2013-03-19	1	-1/+1
* \|	Merge branch 'master-sec'	Aaron Patterson	2013-03-18	4	-2/+39
\|\ \