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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' into serializers	José Valim	2011-11-23	282	-19051/+21651
\|\
\| *	Rely on a public contract between railties instead of accessing railtie metho...	José Valim	2011-11-23	12	-54/+94
\| *	Optimize cache expansion by skipping rails cache id in nested keys.	José Valim	2011-11-23	2	-58/+64
\| *	Merge pull request #3738 from exviva/issues/3737_AS_cache_expand_cache_key	José Valim	2011-11-23	2	-13/+26
\| \|\
\| \| *	Fix #3737 AS::expand_cache_key generates wrong key in certain situations (par...	Olek Janiszewski	2011-11-23	2	-3/+14
\| \| *	Fix #3737 AS::expand_cache_key generates wrong key in certain situations	Olek Janiszewski	2011-11-23	2	-12/+14
\| * \|	Merge pull request #3735 from kennyj/fix_3728	José Valim	2011-11-23	3	-6/+25
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Remove unreachable code, and add additional testcases.	kennyj	2011-11-24	3	-6/+25
\| \|/
\| *	Merge pull request #3725 from marcandre/twz_eql	Yehuda Katz	2011-11-22	4	-4/+30
\| \|\
\| \| *	Fix inconsistencies with Time{WithZone}#{hash,eql?}	Marc-Andre Lafortune	2011-11-22	4	-4/+30
\| * \|	Merge pull request #3724 from marcandre/media_default	Yehuda Katz	2011-11-22	4	-3/+6
\| \|\ \
\| \| * \|	Make explicit the default media when calling stylesheet_tag and change the de...	Marc-Andre Lafortune	2011-11-22	4	-3/+6
\| \| \|/
\| * \|	Merge pull request #3718 from lest/fix-javascript-include-tag	José Valim	2011-11-22	2	-1/+4
\| \|\ \
\| \| * \|	javascript_include_tag should add '.js' to sources that contain '.'	lest	2011-11-22	2	-1/+4
\| * \| \|	Merge pull request #3717 from lest/show-exceptions-refactor	José Valim	2011-11-22	7	-68/+127
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	deprecation warning, changelog entry	lest	2011-11-22	2	-1/+7
\| \| * \|	move show_detailed_exceptions? to Rescue module	lest	2011-11-22	4	-7/+14
\| \| * \|	refactor show exceptions tests	lest	2011-11-22	2	-42/+78
\| \| * \|	add ActionController::Metal#show_detailed_exceptions?	lest	2011-11-22	4	-29/+39
\| * \| \|	remove nodoc on OrderedHash	Vijay Dev	2011-11-22	1	-1/+1
\| \|/ /
\| * \|	tests predicates according to the boolean interpretation of their return valu...	Xavier Noria	2011-11-21	1	-48/+48
\| * \|	Deprecate InstanceMethods namespace handling in ActiveSupport::Concern.	José Valim	2011-11-21	2	-15/+7
\| * \|	Revert "tests predicates according to the boolean interpretation of their ret...	Xavier Noria	2011-11-21	2	-51/+55
\| * \|	tests predicates according to the boolean interpretation of their return valu...	Xavier Noria	2011-11-21	2	-55/+51
\| * \|	cache entry: options[:compressed] is a regular flag, no need for !!	Xavier Noria	2011-11-21	2	-4/+4
\| * \|	adds a comment to clarify an edge case	Xavier Noria	2011-11-21	1	-0/+3
\| * \|	a couple of spurious spaces I saw in passing	Xavier Noria	2011-11-21	1	-2/+2
\| * \|	Remove the -h option to dbconsole which is the shorter form of --header	Vijay Dev	2011-11-22	1	-1/+1
\| * \|	oops! I suck! :bomb:	Aaron Patterson	2011-11-20	1	-1/+0
\| * \|	fixing tests on ruby 1.8	Aaron Patterson	2011-11-20	1	-1/+3
\| * \|	Merge pull request #3701 from arunagw/arel_bump	Aaron Patterson	2011-11-19	1	-1/+1
\| \|\ \
\| \| * \|	Bump Arel	Arun Agrawal	2011-11-20	1	-1/+1
\| \|/ /
\| * \|	removing deprecated methods	Aaron Patterson	2011-11-19	3	-26/+0
\| * \|	Revert "copy options keys to the right place so that undo will work correctly"	Aaron Patterson	2011-11-19	1	-4/+10
\| * \|	adding visitors to the respective adapters	Aaron Patterson	2011-11-19	2	-0/+2
\| * \|	pushing caching and visitors down to the connection	Aaron Patterson	2011-11-19	13	-213/+181
\| * \|	Merge pull request #3668 from gregolsen/api_docstring_fix	Santiago Pastorino	2011-11-19	2	-4/+4
\| \|\ \
\| \| * \|	updating API docstring so that user can infer default value	gregolsen	2011-11-17	2	-4/+4
\| * \| \|	Merge pull request #3696 from lest/fix-plugin-generator	José Valim	2011-11-19	2	-4/+22
\| \|\ \ \
\| \| * \| \|	fix warning about instance variable in plugin generator	lest	2011-11-19	1	-7/+7
\| \| * \| \|	fix rails plugin new CamelCasedName bug	lest	2011-11-19	2	-4/+22
\| \|/ / /
\| * \| \|	Merge pull request #3695 from tobiassvn/partial_path_error	Yehuda Katz	2011-11-19	2	-2/+14
\| \|\ \ \
\| \| * \| \|	Meaningful errors for unexpected partial arguments. Fixes #3573	Tobias Svensson	2011-11-19	2	-2/+14
\| * \| \| \|	Perf fix	Jon Leighton	2011-11-19	2	-2/+11
\| * \| \| \|	Add missing CHANGELOG entry for #3678. Closes #3678.	Jon Leighton	2011-11-19	1	-0/+4
\| * \| \| \|	Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685.	Jon Leighton	2011-11-19	3	-2/+21
\| * \| \| \|	Bump sprockets to 2.1.1	Jon Leighton	2011-11-19	1	-1/+1
\| \|/ / /
\| * \| \|	Merge pull request #3687 from kennyj/fix_3678-2	Jon Leighton	2011-11-19	2	-21/+3
\| \|\ \ \
\| \| * \| \|	Use `show index from`. We could fix `pk_and_sequence_for` method's performanc...	kennyj	2011-11-19	2	-21/+3
\| * \| \| \|	Verify that #3690 has been closed by previous changes to the mysql	Jon Leighton	2011-11-19	3	-2/+14