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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' into normalizecb	Aaron Patterson	2013-05-13	12	-51/+97
\|\
\| *	add tests for reset_calbacks	Aaron Patterson	2013-05-13	1	-0/+40
\| *	Fixes NoMethodError: `alias_method_chain` when requiring just active_support/...	Andy Lindeman	2013-05-12	2	-0/+4
\| *	Fix typo: require -> requires	Rafael Mendonça França	2013-05-12	1	-1/+1
\| *	Add CHANGELOG entry for #10576	Rafael Mendonça França	2013-05-12	1	-0/+7
\| *	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-05-12	4	-2/+11
\| \|\
\| \| *	added docs for InheritedOptions class [ci skip]	Anton Kalyaev	2013-05-11	1	-0/+8
\| \| *	changed rails -> Rails at two places	aditya-kapoor	2013-05-09	2	-2/+2
\| \| *	Changed spelling of Busines to Business	aditya-kapoor	2013-05-08	1	-1/+1
\| \| *	replace apostrophe with backquote for matching [ci skip]	Anton Kalyaev	2013-05-03	1	-2/+2
\| \| *	document String#to_time exception	Vipul A M	2013-05-02	1	-0/+1
\| * \|	Replace multi_json with json	Erik Michaels-Ober	2013-05-11	3	-45/+18
\| * \|	Give credits to all the envolved people [ci skip]	Rafael Mendonça França	2013-05-10	1	-1/+1
\| * \|	Merge pull request #10534 from cmaruz/master	Rafael Mendonça França	2013-05-10	3	-3/+12
\| \|\ \
\| \| * \|	Added escaping of U+2028 and U+2029 inside the json encoder.	Mario Caropreso	2013-05-09	3	-5/+14
\| * \| \|	Fix syntax error on Ruby 2.0	Rafael Mendonça França	2013-05-10	1	-2/+4
\| * \| \|	Merge pull request #10057 from zackham/patch-1	Rafael Mendonça França	2013-05-10	1	-2/+4
\| \|\ \ \
\| \| * \| \|	Escape multibyte line terminators in JSON encoding	zackham	2013-04-02	1	-2/+4
* \| \| \| \|	do not keep a reference to the chain in the callback objects	Aaron Patterson	2013-05-10	1	-12/+10
* \| \| \| \|	fix deprecation test	Aaron Patterson	2013-05-10	1	-0/+2
* \| \| \| \|	push merge code to the callback itself	Aaron Patterson	2013-05-10	1	-18/+10
* \| \| \| \|	dup the callback and set the chain	Aaron Patterson	2013-05-10	1	-8/+8
* \| \| \| \|	remove klass because it is not used	Aaron Patterson	2013-05-10	1	-9/+7
* \| \| \| \|	rename instance variables	Aaron Patterson	2013-05-10	1	-12/+14
* \| \| \| \|	push duplicates? logic to the instance	Aaron Patterson	2013-05-10	1	-16/+7
* \| \| \| \|	callback chain is in charge of the cache, so remove method based cache	Aaron Patterson	2013-05-10	1	-21/+0
* \| \| \| \|	__define_callbacks method is not necessary anymore	Aaron Patterson	2013-05-10	1	-8/+1
* \| \| \| \|	just run compiled callbacks since they are cached	Aaron Patterson	2013-05-10	1	-14/+4
* \| \| \| \|	cache compiled callbacks	Aaron Patterson	2013-05-10	1	-7/+27
* \| \| \| \|	use delegation over inheritance so we can figure when to cache / bust cache	Aaron Patterson	2013-05-10	1	-5/+22
* \| \| \| \|	fixing activemodel tests	Aaron Patterson	2013-05-10	1	-1/+2
* \| \| \| \|	use an environment object to hold state about the filter calls	Aaron Patterson	2013-05-10	1	-21/+41
* \| \| \| \|	object based callbacks cannot be duplicated	Aaron Patterson	2013-05-10	1	-7/+4
* \| \| \| \|	pass the run block as a normal variable to the rest of the callbacks	Aaron Patterson	2013-05-10	1	-12/+12
* \| \| \| \|	fixing more variable names	Aaron Patterson	2013-05-10	1	-10/+10
* \| \| \| \|	fix variable name	Aaron Patterson	2013-05-10	1	-6/+6
* \| \| \| \|	reduce the number of lambas	Aaron Patterson	2013-05-10	1	-5/+2
* \| \| \| \|	callback sequence is no longer used	Aaron Patterson	2013-05-10	1	-6/+0
* \| \| \| \|	no need for variable assignments, just pass the values in	Aaron Patterson	2013-05-10	1	-6/+2
* \| \| \| \|	make_lambda is never called with an Array	Aaron Patterson	2013-05-10	1	-2/+0
* \| \| \| \|	callbacks are wrapped with lambdas	Aaron Patterson	2013-05-10	1	-106/+76
* \| \| \| \|	remove dead code	Aaron Patterson	2013-05-10	1	-10/+0
* \| \| \| \|	fix method names	Aaron Patterson	2013-05-10	1	-40/+44
* \| \| \| \|	using lambas for the callback bodies	Aaron Patterson	2013-05-10	1	-32/+12
* \| \| \| \|	wrap all options in lambas	Aaron Patterson	2013-05-10	1	-7/+13
* \| \| \| \|	conditions in callbacks return consistent lambdas	Aaron Patterson	2013-05-10	1	-9/+43
\|/ / / /
* \| \| \|	Merge pull request #10535 from vipulnsward/remove_var	Carlos Antonio da Silva	2013-05-09	1	-1/+0
\|\ \ \ \
\| * \| \| \|	remove redundant var	Vipul A M	2013-05-09	1	-1/+0
* \| \| \| \|	Merge pull request #10531 from waseem/refactor_require	Carlos Antonio da Silva	2013-05-09	1	-4/+4
\|\ \ \ \ \
\| * \| \| \| \|	Require different core extensions correctly.	Waseem Ahmad	2013-05-09	1	-4/+4
\| \|/ / / /