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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	adds a comments that clarifies why Range#include? chooses the comparison ↵	Xavier Noria	2011-12-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	operator
* \| \| \| \| \| \| \|	Merge pull request #4229 from lest/range-include	Xavier Noria	2011-12-30	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	refactor Range#include? to handle ranges with floats
\| * \| \| \| \| \| \|	refactor Range#include? to handle ranges with floats	Sergey Nartimov	2011-12-29	2	-1/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	just add the writer rather than adding both and removing one	Aaron Patterson	2011-12-29	1	-2/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	stop using __send__ and just module eval in the extensions	Aaron Patterson	2011-12-29	1	-3/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	we know the classes will be a list, so tell it to respond to each	Aaron Patterson	2011-12-29	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rather than casting
* \| \| \| \| \| \| \|	don't need the begin / end	Aaron Patterson	2011-12-29	1	-21/+17
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	avoid extra method calls by just defining the delegate	Aaron Patterson	2011-12-29	1	-2/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4226 from grentis/content_for_with_flush	José Valim	2011-12-29	2	-8/+84
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	content_for with flush parameter
\| * \| \| \| \| \| \| \|	content_for with flush parameter	grentis	2011-12-29	2	-8/+84
\|/ / / / / / / /
* \| / / / / / /	don't use instance eval, just reference variables so we don't have to	Aaron Patterson	2011-12-29	1	-10/+11
\| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	worry about "inspect" marshalling
* \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-12-29	5	-22/+17
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	revise some doc changes	Vijay Dev	2011-12-29	1	-9/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Documented about using :path option for resources	Kevin Moore	2011-12-28	1	-0/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed formatting of code examples in form_tag_helper.rb	Alejandro Andrés	2011-12-28	1	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	typo	Jo Liss	2011-12-28	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Document that index names are made up of all columns, not just the first.	Jo Liss	2011-12-27	1	-9/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	index_name has been using the following expression "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}" since at least 2006 (bc7f2315), and that's how they come out in my DB. Please check that this is correct before merging into master, perhaps I'm misunderstanding the section I changed.
\| * \| \| \| \| \| \|	Remove unnecessary comma.	Uģis Ozols	2011-12-26	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	removing dead code.	Aaron Patterson	2011-12-29	1	-12/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	decouple initialize from clear!. Initialize ivars in initialize, clear	Aaron Patterson	2011-12-29	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ivars in clear!
* \| \| \| \| \| \| \|	modules don't have any instance methods	Aaron Patterson	2011-12-29	1	-3/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Deprecate implicit eager loading. Closes #950.	Jon Leighton	2011-12-29	27	-99/+181
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4231 from nashby/remove-constantize-ruby-18	José Valim	2011-12-29	1	-39/+24
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove ruby 1.8 checking in constantize method
\| * \| \| \| \| \| \| \|	remove ruby 1.8 checking in constantize method	Vasiliy Ermolovich	2011-12-29	1	-39/+24
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #4230 from alovak/patch-1	José Valim	2011-12-29	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Fix rails/generators/base.rb documentation for hook_for
\| * \| \| \| \| \| \|	Fix rails/generators/base.rb documentation for hook_for	Pavel Gabriel	2011-12-29	1	-3/+3
\|/ / / / / / /
* \| \| \| \| \| \|	simplify sweep now that discard and flashes are in sync	Aaron Patterson	2011-12-28	1	-8/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	mutations on the underlying hash should also mutate the discard set	Aaron Patterson	2011-12-28	2	-3/+24
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	rename @used to something a bit more meaningful	Aaron Patterson	2011-12-28	1	-7/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	mutations can't be done without the consent of our proxy object. This	Aaron Patterson	2011-12-28	2	-3/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	is one benefit of choosing composition over inheritance.
* \| \| \| \| \| \|	again, use Set#subtract	Aaron Patterson	2011-12-28	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Use Set#subtract and Set#merge for keeping track of used / unused keys	Aaron Patterson	2011-12-28	1	-15/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	fix method visibility	Aaron Patterson	2011-12-28	1	-15/+15
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	no need for bang bang :bomb:	Aaron Patterson	2011-12-28	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids	Aaron Patterson	2011-12-28	2	-1/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	allow reorder to affect eager loading correctly
\| * \| \| \| \| \| \|	allow reorder to affect eager loading correctly	Matt Jones + Scott Walker	2011-12-28	2	-1/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix CI	Jon Leighton	2011-12-28	5	-25/+25
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	app code in general wants Time.current, not Time.now	Xavier Noria	2011-12-28	1	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4222 from amatsuda/ar_predicate_builder_refactor	Aaron Patterson	2011-12-28	1	-35/+37
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactor AR::PredicateBuilder.build_from_hash
\| * \| \| \| \| \| \| \|	refactor AR::PredicateBuilder.build_from_hash	Akira Matsuda	2011-12-29	1	-35/+37
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #4221 from tonycoco/master	Jon Leighton	2011-12-28	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails template creation issue
\| * \| \| \| \| \| \| \| \|	Update railties/lib/rails/generators/actions.rb	Tony Coconate	2011-12-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Delete some stray lines	Jon Leighton	2011-12-28	2	-3/+0
\| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Revert "Merge pull request #4220 from bensie/singleton-class-master"	Jon Leighton	2011-12-28	1	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 90df0d4f687596943bda108ab0b98dd99cacd46b, reversing changes made to 5e6fc81d63837559a393c173eade281ddeb687dd. Reason: build breakage
* \| \| \| \| \| \| \| \|	Avoid deprecation warning	Jon Leighton	2011-12-28	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Support establishing connection on ActiveRecord::Model.	Jon Leighton	2011-12-28	25	-230/+251
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is the 'top level' connection, inherited by any models that include ActiveRecord::Model or inherit from ActiveRecord::Base.
* \| \| \| \| \| \| \| \|	Support configuration on ActiveRecord::Model.	Jon Leighton	2011-12-28	28	-222/+498
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The problem: We need to be able to specify configuration in a way that can be inherited to models that include ActiveRecord::Model. So it is no longer sufficient to put 'top level' config on ActiveRecord::Base, but we do want configuration specified on ActiveRecord::Base and descendants to continue to work. So we need something like class_attribute that can be defined on a module but that is inherited when ActiveRecord::Model is included. The solution: added ActiveModel::Configuration module which provides a config_attribute macro. It's a bit specific hence I am not putting this in Active Support or making it a 'public API' at present.
* \| \| \| \| \| \| \| \|	Merge pull request #4207 from nashby/deprecate-base64-encode64s	Aaron Patterson	2011-12-28	6	-9/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	deprecate Base64.encode64s from AS
\| * \| \| \| \| \| \| \| \|	deprecate Base64.encode64s from AS. Use Base64.strict_encode64 instead	Vasiliy Ermolovich	2011-12-27	6	-9/+15
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Add CHANGELOG entry	Santiago Pastorino	2011-12-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \|