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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow to display engine's routes when running `rake routes ENGINES=true`	Piotr Sarnacki	2011-11-24	4	-6/+70
\|
*	Merge pull request #3746 from qoobaa/active-model-naming-with-anonymous-classes	Piotr Sarnacki	2011-11-24	2	-0/+16
\|\ \| \| \| \|	make ActiveModel::Name fail gracefully with anonymous classes
\| *	make ActiveModel::Name fail gracefully with anonymous classes	Jakub Kuźma	2011-11-24	2	-0/+16
\|/
*	Forgot to add CHANGELOG entry for config.railties_order	Piotr Sarnacki	2011-11-24	1	-0/+4
\|
*	Merge pull request #3739 from lest/config-always-write-cookie	José Valim	2011-11-23	4	-4/+56
\|\ \| \| \| \|	configuration option to always write cookie
\| *	configuration option to always write cookie	lest	2011-11-23	4	-4/+56
\| \|
* \|	Allow to change engine's loading priority with config.railties_order=	Piotr Sarnacki	2011-11-23	4	-4/+173
\|/
*	Merge pull request #3731 from HeeL/master	Yehuda Katz	2011-11-23	1	-3/+14
\|\ \| \| \| \|	code stats calculation
\| *	improved code stats calculation, check on multiline comments and rewrite ↵	Sergey Parizhskiy	2011-11-23	1	-3/+14
\| \| \| \| \| \| \| \|	regexps according to a class naming convention
* \|	Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_test	Yehuda Katz	2011-11-23	1	-3/+3
\|\ \ \| \| \| \| \| \|	Warnings removed. (ambiguous first argument)
\| * \|	Warnings removed. (ambiguous first argument)	kennyj	2011-11-24	1	-3/+3
\| \|/
* \|	Rely on a public contract between railties instead of accessing railtie ↵	José Valim	2011-11-23	12	-54/+94
\| \| \| \| \| \| \| \|	methods directly.
* \|	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
\|\ \ \| \| \| \| \| \|	Issues/3737 AS::Cache.expand_cache_key
\| * \|	Fix #3737 AS::expand_cache_key generates wrong key in certain situations ↵	Olek Janiszewski	2011-11-23	2	-3/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(part 2) `nil` and `false` both expand to `""` (empty string), while `true` expands to `"true"`; `false` should expand to `"false"`
\| * \|	Fix #3737 AS::expand_cache_key generates wrong key in certain situations	Olek Janiszewski	2011-11-23	2	-12/+14
\| \|/ \| \| \| \| \| \| \| \|	`cache_key` method is never called when the argument is a 1-element array with something that responds to `cache_key`
* \|	Merge pull request #3735 from kennyj/fix_3728	José Valim	2011-11-23	3	-6/+25
\|\ \ \| \|/ \|/\|	Fix #3728 Remove unreachable code, and add additional testcases.
\| *	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?}
\| *	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
\|\ \ \| \| \| \| \| \|	stylesheet_tag default's media is "screen"
\| * \|	Make explicit the default media when calling stylesheet_tag and change the ↵	Marc-Andre Lafortune	2011-11-22	4	-3/+6
\| \|/ \| \| \| \| \| \|	default generators.
* \|	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 '.'
\| * \|	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
\|\ \ \ \| \|/ / \|/\| \|	Show exceptions refactor: controller should be responsible for choice to show exceptions
\| * \|	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 ↵	Xavier Noria	2011-11-21	1	-48/+48
\| \| \| \| \| \| \| \| \| \| \| \|	value, not expecting specifically true or false Respecting Genuine assert_equal false Edition
* \|	Deprecate InstanceMethods namespace handling in ActiveSupport::Concern.	José Valim	2011-11-21	2	-15/+7
\| \| \| \| \| \| \| \|	This avoids the unnecessary "yo dawg, I heard you like include, so I put a module that includes your module when it is included" approach when building extensions.
* \|	Revert "tests predicates according to the boolean interpretation of their ↵	Xavier Noria	2011-11-21	2	-51/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	return value, not expecting specifically true or false" Reason: there were some genuine tests for false when reading values, going to revise those ones. This reverts commit a539a5e3f3be68f027d3dfe43f88dc9f0642c743.
* \|	tests predicates according to the boolean interpretation of their return ↵	Xavier Noria	2011-11-21	2	-55/+51
\| \| \| \| \| \| \| \|	value, not expecting specifically true or false
* \|	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
\| \| \| \| \| \| \| \| \| \| \| \|	This is done since the -h option to dbconsole hides the conventional -h for help and forces users to use --help to see the usage options for dbconsole.
* \|	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
\| * \|	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
\| \| \| \| \| \| \| \|	This reverts commit 3178cc9a80262d3bf7754f3507ef60243b46634f.
* \|	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
\| * \|	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 rails plugin new CamelCasedName bug
\| * \| \|	fix warning about instance variable in plugin generator	lest	2011-11-19	1	-7/+7
\| \| \| \|