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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #10158 from steveklabnik/issue_10125	Steve Klabnik	2013-04-09	1	-2/+2
\|\
\| *	Fix inflector to respect default locale.	Nick Cox	2013-04-10	1	-2/+2
* \|	Changed the ScopeRegistry and the InstrumentationRegistry to use the	wangjohn	2013-04-09	1	-5/+4
* \|	Creating a module so that per thread registries can be easily created as	wangjohn	2013-04-09	1	-0/+41
\|/
*	Creating an object to consolidate thread locals which hold the	wangjohn	2013-04-08	1	-1/+27
*	Add option to Class#class_attribute for skipping the query method	Agis-	2013-04-06	1	-3/+5
*	`fast_xs` support has been removed. Use 'String#encode(xml: :attr)`.	Aaron Patterson	2013-04-05	2	-19/+0
*	Revert "Merge pull request #10034 from benofsky/fix_skipping_object_callback_...	Rafael Mendonça França	2013-04-04	1	-13/+1
*	Merge pull request #10034 from benofsky/fix_skipping_object_callback_filters	Rafael Mendonça França	2013-04-04	1	-1/+13
\|\
\| *	Fixes skipping object callback filters	Ben McRedmond	2013-04-04	1	-1/+13
* \|	Merge pull request #10080 from vipulnsward/railties_warning_fix_v2	Steve Klabnik	2013-04-03	1	-0/+1
\|\ \
\| * \|	add require to suppress warning; remove variable	Vipul A M	2013-04-04	1	-0/+1
* \| \|	Fixed Typo	Prathamesh Sonpatki	2013-04-04	1	-1/+1
* \| \|	Fix some railties test warnings	Vipul A M	2013-04-03	1	-3/+2
\|/ /
* \|	Rename DummyKeyGenerator -> LegacyKeyGenerator	Trevor Turk	2013-04-02	1	-1/+1
* \|	change merge to merge! in AS on new hashes	Vipul A M	2013-04-02	2	-2/+2
\|/
*	Merge pull request #9997 from vipulnsward/hash_destructive_merge	Carlos Antonio da Silva	2013-03-30	2	-2/+2
\|\
\| *	change merge to merge!	Vipul A M	2013-03-29	2	-2/+2
* \|	Merge pull request #10007 from vipulnsward/fix_AS_typos	Carlos Antonio da Silva	2013-03-30	1	-1/+1
\|\ \
\| * \|	fix some typos in AS	Vipul A M	2013-03-30	1	-1/+1
\| \|/
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-03-30	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	Fix some typos	Akira Matsuda	2013-03-25	1	-1/+1
* \|	determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn]	Xavier Noria	2013-03-28	1	-0/+2
* \|	Merge pull request #9523 from stopdropandrew/Instrumenter#instrument-yields-p...	Rafael Mendonça França	2013-03-27	1	-1/+1
\|\ \
\| * \|	ActiveSupport::Notifications::Instrumenter#instrument should yield	stopdropandrew	2013-03-02	1	-1/+1
* \| \|	Fixed timezone mapping of Ulaanbaatar.	Zolzaya	2013-03-27	1	-1/+1
* \| \|	Updated docs due to removal of serializer accessor	Albert Lash	2013-03-24	1	-3/+3
* \| \|	Merge pull request #8501 from charliesome/version-to-s	Rafael Mendonça França	2013-03-23	1	-6/+7
\|\ \ \
\| * \| \|	Add version method to top level modules	Charlie Somerville	2013-03-21	1	-6/+7
* \| \| \|	Tidying up some require : removing useless sort and homogenizing with the res...	Intrepidd	2013-03-20	1	-2/+2
\|/ / /
* \| \|	remove unused payloads in blocks in caching instrumentation	Vipul A M	2013-03-19	1	-3/+3
* \| \|	Merge branch 'master-sec'	Aaron Patterson	2013-03-18	1	-0/+6
\|\ \ \
\| * \| \|	JDOM XXE Protection [CVE-2013-1856]	Ben Murphy	2013-03-15	1	-0/+6
\| \| \|/ \| \|/\|
* \| \|	`TimeWithZone` raises `NoMethodError` in proper context.	Yves Senn	2013-03-18	1	-0/+2
* \| \|	Revert "Merge pull request #8156 from fredwu/acronym_fix-master"	Steve Klabnik	2013-03-16	1	-1/+1
* \| \|	Fixed a bug where the inflector would replace camelCase strings and disregard...	Fred Wu	2013-03-17	1	-1/+1
* \| \|	Revert "make new rails apps log to STDOUT"	Steve Klabnik	2013-03-15	1	-8/+0
* \| \|	make new rails apps log to STDOUT	Terence Lee	2013-03-15	1	-0/+8
* \| \|	removing out of date comment. :heart::heart::heart::heart::heart::heart::hea...	Aaron Patterson	2013-03-12	1	-3/+0
* \| \|	drop memory consumption and startup speed by switching to define_method	Aaron Patterson	2013-03-12	1	-23/+28
* \| \|	Remove manual "return true" from AS::TZ match method	Carlos Antonio da Silva	2013-03-12	1	-1/+1
* \| \|	included "Montevideo" in list of time zone aliases (closes Issue #9628)	Gernot	2013-03-09	1	-0/+1
\|/ /
* \|	Call String#gsub with Hash directly	Aman Gupta	2013-03-04	1	-2/+2
* \|	only calculate next_id when we need a new method defined	Aaron Patterson	2013-03-04	1	-1/+2
\|/
*	Fix deletion of empty directories:	Charles Jones	2013-02-25	1	-2/+2
*	Preparing for 4.0.0.beta1 release	David Heinemeier Hansson	2013-02-25	1	-1/+1
*	Keep second fraction when DateTime#change is called.	Chris Baynes	2013-02-25	1	-1/+1
*	Revert "Simplify code in AS json encoder"	Guillermo Iguaran	2013-02-25	1	-8/+15
*	Merge pull request #8815 from bogdan/simplified-to-json-args	Steve Klabnik	2013-02-24	1	-15/+8
\|\
\| *	Simplify code in AS json encoder	Bogdan Gusiev	2013-01-06	1	-15/+8