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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix typo	Jon Leighton	2011-11-30	1	-2/+2
\|
*	Don't need second param	Jon Leighton	2011-11-30	2	-4/+4
\|
*	No longer need to undef id as we are defining it ourselves	Jon Leighton	2011-11-30	1	-3/+0
\|
*	Move some serialization stuff out of Base	Jon Leighton	2011-11-30	2	-40/+42
\|
*	Extract attribute serialization code into a separate module	Jon Leighton	2011-11-30	4	-28/+49
\|
*	Use inheritance to avoid special-case code for the 'id' method	Jon Leighton	2011-11-30	4	-9/+21
\|
*	#id is an alias for whatever the primary key is	Jon Leighton	2011-11-30	1	-1/+1
\|
*	fix indent	Jon Leighton	2011-11-30	1	-3/+3
\|
*	expand on pluck docs	Vijay Dev	2011-12-01	1	-3/+18
\|
*	minor typo fix	Vijay Dev	2011-12-01	2	-2/+2
\|
*	s/is is/is	Vijay Dev	2011-12-01	1	-1/+1
\|
*	Merge pull request #3816 from lest/exception-page-utf-8	Yehuda Katz	2011-11-30	2	-12/+35
\|\ \| \| \| \|	fix exception page when template contains utf-8 and parameters contain utf-8
\| *	fix exception page when template contains utf-8 and parameters contain utf-8	lest	2011-11-30	2	-12/+35
\| \|
* \|	Merge pull request #3786 from nashby/add-namespace-to-form	Vijay Dev	2011-11-30	1	-1/+1
\|\ \ \| \| \| \| \| \|	update guides for the namespace option in form helpers
\| * \|	update guides	Vasiliy Ermolovich	2011-11-28	1	-1/+1
\| \| \|
* \| \|	fix bad nodocs	Vijay Dev	2011-12-01	1	-11/+21
\| \|/ \|/\|
* \|	switch WatchStack to use composition, tighten up API	Aaron Patterson	2011-11-30	1	-6/+13
\| \|
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-11-30	9	-14/+21
\|\ \
\| * \|	Fixing incorrect documentation	Aviv Ben-Yosef	2011-11-30	1	-2/+2
\| \| \| \| \| \| \| \| \|	`path_names` can only be used for affecting `new` and `edit`
\| * \|	Fix ActionDispatch::Request method explanations	Travis Pew	2011-11-28	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The methods, "post?", "put?", "head?", etc. contain an incorrect explanation. They state that they are equivalent to request_method == :type, but this is not accurate because the methods convert the string to a symbol. They are actually equivalent to: request_method_symbol == :type
\| * \|	there is no need to repeat about possibility of using -h option to get full help	Sergey Parizhskiy	2011-11-28	1	-1/+1
\| \| \|
\| * \|	Merge branch 'master' of github.com:lifo/docrails	Sergey Parizhskiy	2011-11-28	159	-1812/+2855
\| \|\ \
\| \| * \|	Update information about foreign key plugins support in the guides	Rodrigo Rosenfeld Rosas	2011-11-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is not "a number" of up-to-date maintained plugins for dealing with foreign keys. The foreign_key_migrations does not have any update since 2009 and is also about to be removed: Extracted from http://www.harukizaemon.com/2009/09/plugins-grab-em-while-theyre-stale.html, referenced in the plugin reference of the old guide version: "And so it is that I will very shortly (within the next month) delete most of the plugins from my GitHub account (harukizaemon)"
\| \| * \|	Revert "fixed typo in getting started form_for for comments"	Arun Agrawal	2011-11-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 2f428a6245a18017c7942f8fef3da4a85bec8cc5. See comments here 2f428a6245a18017c7942f8fef3da4a85bec8cc5
\| \| * \|	fixed typo in getting started form_for for comments	Tim Reischmann	2011-11-28	1	-1/+1
\| \| \| \|
\| \| * \|	Update Object#in? description for https://github.com/rails/rails/pull/3767	Tadas Tamošauskas	2011-11-27	1	-1/+3
\| \| \| \|
\| \| * \|	[Docs] Adding RequestId middleware in configuring middleware	Arun Agrawal	2011-11-27	1	-0/+1
\| \| \| \|
\| \| * \|	Documentation about config.log_level config options	Arun Agrawal	2011-11-27	1	-0/+2
\| \| \| \|
\| \| * \|	Cosmetic fixes in AM validatations docs	Alexey Vakhov	2011-11-27	2	-4/+4
\| \| \| \|
\| \| * \|	Let's say this 3.1.3 instead of 3.1.1 in docs	Arun Agrawal	2011-11-26	1	-1/+1
\| \| \| \|
\| * \| \|	completed documentation for the rails server command	Sergey Parizhskiy	2011-11-28	1	-0/+2
\| \| \| \|
* \| \| \|	Revert "Implement ArraySerializer and move old serialization API to a new ↵	José Valim	2011-11-30	16	-734/+431
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	namespace." This reverts commit 8896b4fdc8a543157cdf4dfc378607ebf6c10ab0. Conflicts: activemodel/lib/active_model.rb activemodel/lib/active_model/serializable.rb activemodel/lib/active_model/serializer.rb activemodel/test/cases/serializer_test.rb
* \| \| \|	Revert "avoid hundreds of thousands of calls to (Symbol\|String)#to_s"	Aaron Patterson	2011-11-30	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test coverage isn't comprehensive enough to catch what this breaks. :( This reverts commit 45dad592e47944704ab6951351b2fa29d4a2385f.
* \| \| \|	avoid hundreds of thousands of calls to (Symbol\|String)#to_s	Aaron Patterson	2011-11-30	1	-2/+2
\| \| \| \|
* \| \| \|	`run_test` method conflicts with newer minitest, so change the name	Aaron Patterson	2011-11-30	1	-5/+5
\| \| \| \|
* \| \| \|	Using InstanceMethods in a Concern is deprecated	Jeremy Kemper	2011-11-30	1	-10/+6
\| \| \| \|
* \| \| \|	Merge pull request #3810 from lest/fix-warnings	José Valim	2011-11-30	7	-40/+35
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	fix method redefined warnings in tests
\| * \| \| \|	fix method redefined warning in activemodel	lest	2011-11-30	2	-1/+5
\| \| \| \| \|
\| * \| \| \|	fix deprecation warnings in activeresource	lest	2011-11-30	2	-27/+25
\| \| \| \| \|
\| * \| \| \|	fix method redefined warnings in tests	lest	2011-11-30	3	-12/+5
\|/ / / /
* \| \| \|	Merge pull request #3809 from lest/test-helpers-in-erb	José Valim	2011-11-30	1	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	fix warning in tests when using render_erb helper
\| * \| \| \|	fix warning in tests when using render_erb helper	lest	2011-11-30	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3806 from lest/test-helpers-in-erb	José Valim	2011-11-30	6	-17/+31
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test helpers in erb using erb
\| * \| \| \|	test helpers in erb using erb	lest	2011-11-30	6	-17/+31
\|/ / / /
* \| \| \|	Merge pull request #1915 from bogdan/active_record_map	Jon Leighton	2011-11-30	6	-2/+62
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	ActiveRecord::Base.map method for direct select by single column
\| * \| \| \|	ActiveRecord::Relation#pluck method	Bogdan Gusiev	2011-11-30	6	-2/+62
\| \| \| \| \|
* \| \| \| \|	Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time ↵	José Valim	2011-11-30	7	-8/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a before callback halts.
* \| \| \| \|	Update sprockets which theoretically fixes the regression we have seen.	José Valim	2011-11-30	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Fixes for using action view template in isolation.	José Valim	2011-11-30	3	-2/+12
\|/ / / /
* \| \| \|	Module#synchronize is deprecated with no replacement. Please use `monitor` ↵	Aaron Patterson	2011-11-29	3	-89/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from ruby's standard library.