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

	Commit message (Expand)	Author	Age	Files	Lines
*	Expected attachment encoding is binary	Jeremy Kemper	2010-01-27	1	-2/+4
*	Use format of ARes rather than content-type of remote errors to load errors.	Jatinder Singh	2010-01-27	2	-3/+16
*	Time#- with a DateTime argument behaves the same as with a Time argument, i.e...	Geoff Buesing	2010-01-27	3	-1/+7
*	active_support/ordered_hash now requires yaml	snusnu	2010-01-27	1	-0/+2
*	self.defaults => default	Jeremy Kemper	2010-01-27	1	-3/+4
*	Remove unbundle changelogs	Jeremy Kemper	2010-01-27	2	-9/+1
*	Merge remote branch 'mikel/master'	Jeremy Kemper	2010-01-27	157	-19756/+14
\|\
\| *	Unvendor'd text-format, now requires text-format gem	Mikel Lindsaar	2010-01-28	5	-1478/+4
\| *	Unvendor'd MemCache-Client. Now requires the MemCache Client gem as a depend...	Mikel Lindsaar	2010-01-28	6	-1157/+5
\| *	Unvendor'd Builder. Now requires the Builder gem as a dependency	Mikel Lindsaar	2010-01-28	10	-1041/+3
\| *	Unbundling TZInfo	Mikel Lindsaar	2010-01-28	142	-16082/+4
\| *	Updated mail requirement to 2.1.2	Mikel Lindsaar	2010-01-28	1	-1/+1
\|/
*	Adding custom yaml (de-)serialization for OrderedHash	Gregor Schmidt	2010-01-27	3	-1/+48
*	Fixed bug on HTML only emails getting set to text/plain	Mikel Lindsaar	2010-01-28	4	-1/+21
*	Update bundled TZInfo to v0.3.16	Geoff Buesing	2010-01-26	142	-120/+124
*	Georgetown TimeZone is now mapped to "America/Guyana" instead of "America/Arg...	Geoff Buesing	2010-01-26	3	-3/+29
*	Merge remote branch 'fxn/master'	Jeremy Kemper	2010-01-26	8	-264/+0
\|\
\| *	removes now void extending.rb	Xavier Noria	2010-01-26	3	-6/+0
\| *	removes Object#extended_by	Xavier Noria	2010-01-26	2	-11/+0
\| *	removes unused method Object#extend_with_included_modules_from	Xavier Noria	2010-01-26	2	-19/+0
\| *	deletes no void files removal.rb and class_test.rb	Xavier Noria	2010-01-26	6	-29/+0
\| *	removes unused method Class#remove_class	Xavier Noria	2010-01-26	2	-48/+0
\| *	removes unused method Class#reachable?	Xavier Noria	2010-01-26	1	-5/+0
\| *	removes unused Class#descedents	Xavier Noria	2010-01-26	1	-34/+0
\| *	removes unused Object#subclasses_of	Xavier Noria	2010-01-26	2	-61/+0
\| *	removes unused Object#remove_subclasses_of	Xavier Noria	2010-01-26	1	-4/+0
\| *	removes unused Class#remove_subclasses	Xavier Noria	2010-01-26	2	-30/+0
\| *	removes unused method Class#subclasses	Xavier Noria	2010-01-26	2	-17/+0
* \|	Fixing mailer generators to use the right email address	Mikel Lindsaar	2010-01-27	1	-1/+1
* \|	future proofing the sqlite3 adapter code	Aaron Patterson	2010-01-26	3	-3/+12
* \|	AC railtie should configure helpers path.	José Valim	2010-01-26	3	-6/+9
* \|	Fix t('.helper').	José Valim	2010-01-26	7	-26/+37
* \|	Bring AM tests back to green again.	José Valim	2010-01-26	3	-17/+3
* \|	Fix failing tests on AM about render(:body => Hash).	José Valim	2010-01-26	6	-68/+36
* \|	Merge branch 'master' of git://github.com/rails/rails	José Valim	2010-01-26	6	-2/+58
\|\ \
\| * \|	Failing AM test for legacy multipart alternative rendering	Joshua Peek	2010-01-26	3	-0/+39
\| * \|	Failing AM test for nested layouts	Joshua Peek	2010-01-26	3	-2/+19
* \| \|	Bring layouts with proc back alive.	José Valim	2010-01-26	2	-1/+18
* \| \|	Also include translation in ActionMailer.	José Valim	2010-01-26	1	-0/+1
\|/ /
* \|	Merge branch 'master' of git://github.com/rails/rails	José Valim	2010-01-26	1	-37/+33
\|\ \
\| * \|	Keep ActionController::Base.helpers_dir around for a bit longer	Joshua Peek	2010-01-26	1	-37/+33
* \| \|	Merge remote branch 'mikel/master'	José Valim	2010-01-26	7	-162/+252
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Tidy up tests and docs.	José Valim and Mikel Lindsaar	2010-01-26	2	-20/+21
\| * \|	Fixing up tests and docs to use defaults :from => 'name' instead of defaults(...	Mikel Lindsaar	2010-01-27	2	-4/+5
\| * \|	Merge branch 'master' of github.com:mikel/rails	Mikel Lindsaar	2010-01-27	6	-28/+45
\| \|\ \
\| \| * \|	Update generators to use new defaults.	José Valim and Mikel Lindsaar	2010-01-26	2	-2/+2
\| \| * \|	Deprecate old defaults API.	José Valim and Mikel Lindsaar	2010-01-26	4	-32/+43
\| * \| \|	Fixed up documentation to reflect code change and cleaned up tests of spuriou...	Mikel Lindsaar	2010-01-27	2	-59/+58
\| * \| \|	Fixed up being able to pass random headers in with headers, or mail. Also, u...	Mikel Lindsaar	2010-01-27	2	-16/+50
\| \|/ /
\| * \|	Make defaults accept a hash.	José Valim and Mikel Lindsaar	2010-01-26	2	-79/+84