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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #1398 from leereilly/my_new_branch	Aaron Patterson	2011-05-29	6	-10/+10
\|\
\| *	Corrected some typos and American vs. Queen's English issues	Lee Reilly	2011-05-29	6	-10/+10
\|/
*	Merge pull request #1384 from amatsuda/simplify_drop_table	Aaron Patterson	2011-05-28	3	-10/+2
\|\
\| *	No need to pass options which is never used	Akira Matsuda	2011-05-29	1	-2/+2
\| *	No need to override for just calling super	Akira Matsuda	2011-05-29	2	-8/+0
* \|	Merge pull request #1380 from vijaydev/session_migration	José Valim	2011-05-28	1	-5/+1
\|\ \
\| * \|	Use change in place of up and down in sessions table migration	Vijay Dev	2011-05-28	1	-5/+1
\| \|/
* \|	Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-tests	José Valim	2011-05-28	2	-0/+29
\|\ \ \| \|/ \|/\|
\| *	use to_param (and change method to name accordingly)	David Chelimsky	2011-05-22	1	-8/+8
\| *	Stringify param values in controller tests.	David Chelimsky	2011-05-22	2	-0/+29
* \|	Merge pull request #1378 from AndrewRadev/master	José Valim	2011-05-28	1	-0/+3
\|\ \
\| * \|	ActiveSupport CHANGELOG entry moved to correct place	Andrew Radev	2011-05-28	1	-2/+2
\| * \|	Update CHANGELOG for ActiveSupport::OrderedHash change	Andrew Radev	2011-05-28	1	-0/+3
* \| \|	Merge pull request #1373 from anbotero/master	José Valim	2011-05-28	1	-1/+1
\|\ \ \
\| * \| \|	Fix typo in test.	Andrés Botero	2011-05-28	1	-1/+1
\|/ / /
* \| \|	Merge pull request #1372 from jacott/master	José Valim	2011-05-27	3	-11/+13
\|\ \ \
\| * \| \|	fixed asset_paths when called from sprockets for relative_url_root	jacott	2011-05-28	3	-11/+13
* \| \| \|	Merge pull request #1371 from FLOChip/typo	Xavier Noria	2011-05-27	1	-9/+9
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	minor typo in the rdoc about Interceptor.	Teng Siong Ong	2011-05-28	1	-1/+1
\| * \| \|	minor spacing fix in code example in ActionMailer::Base.	Teng Siong Ong	2011-05-28	1	-8/+8
\|/ / /
* \| \|	Merge pull request #1368 from amatsuda/disable_im_by_default_on_test	Aaron Patterson	2011-05-27	1	-2/+2
\|\ \ \
\| * \| \|	Disable IdentityMap by default for ActiveRecord testing	Akira Matsuda	2011-05-28	1	-2/+2
\|/ / /
* \| \|	stop using boolean expressions because of the side effects	Aaron Patterson	2011-05-27	1	-1/+4
* \| \|	Merge pull request #1365 from gnufied/sqlite3	Aaron Patterson	2011-05-27	2	-2/+2
\|\ \ \
\| * \| \|	delegate connection and column_hash calls directly to model	Hemant Kumar	2011-05-28	1	-1/+1
\| * \| \|	close statment only if its not closed	Hemant Kumar	2011-05-28	1	-1/+1
* \| \| \|	Merge pull request #1229 from workmad3/master	Aaron Patterson	2011-05-27	2	-2/+16
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Added a test to check for correct behaviour with no options in add_index comm...	David Workman	2011-05-24	1	-0/+6
\| * \| \|	Using .try to test for the existence of a method option in a nil-resistent ma...	David Workman	2011-05-23	1	-5/+2
\| * \| \|	Neatened up the invert_add_index method as per suggeston	David Workman	2011-05-23	1	-2/+3
\| * \| \|	Simple fix for correctly inverting an add_index migration when a name has bee...	David Workman	2011-05-23	2	-2/+12
* \| \| \|	work around bug in the sqlite3 bindings. fixes #1289	Aaron Patterson	2011-05-27	1	-0/+1
* \| \| \|	Merge pull request #1346 from arunagw/jdom_file_from_xml_fix	Aaron Patterson	2011-05-27	2	-15/+22
\|\ \ \ \
\| * \| \| \|	Adding tests for file_from_xml for XmlMini_JDOM #jruby	Arun Agrawal	2011-05-27	1	-14/+14
\| * \| \| \|	Adding __content__ into XmlMini_JDOM	Arun Agrawal	2011-05-27	1	-1/+8
* \| \| \| \|	fixing test for mysql2	Aaron Patterson	2011-05-27	1	-5/+2
* \| \| \| \|	Merge pull request #1359 from AndrewRadev/master	José Valim	2011-05-27	2	-1/+28
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Fixes minor ruby 1.8 inconsistency	Andrew Radev	2011-05-27	2	-1/+28
\|/ / / /
* \| \| \|	adding a test for #1322	Aaron Patterson	2011-05-26	1	-0/+15
* \| \| \|	Merge pull request #1323 from fx/association_primary_key	Jon Leighton	2011-05-26	2	-1/+11
\|\ \ \ \
\| * \| \| \|	added assertion for non-standard primary_key on models used in the primary_ke...	Marian Rudzynski	2011-05-26	1	-0/+3
\| * \| \| \|	use association_primary_key in AssociationScope#add_constraints	Marian Rudzynski	2011-05-26	2	-1/+8
* \| \| \| \|	Merge pull request #1318 from TheEmpty/master	Jon Leighton	2011-05-26	3	-19/+0
\|\ \ \ \ \
\| * \| \| \| \|	Removes a now needless test - via Github	Mohammad Typaldos	2011-05-26	1	-8/+0
\| * \| \| \| \|	Removes the restriction on primary key when joining in a habtm && test that i...	Mohammad El-Abid	2011-05-26	3	-15/+4
* \| \| \| \| \|	Merge pull request #1334 from bogdan/callback	José Valim	2011-05-26	7	-39/+57
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	MassAssignmentSecurity: add ability to specify your own sanitizer	Bogdan Gusiev	2011-05-26	7	-39/+57
* \| \| \| \| \|	Merge pull request #1344 from jmileham/serialization_includes	José Valim	2011-05-26	2	-6/+11
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Don't merge base opts into includes when serializing ARs	John Mileham	2011-05-26	1	-6/+2
\| * \| \| \| \| \|	Failing test - JSON serialization shouldn't merge base opts into include opts.	John Mileham	2011-05-26	1	-0/+9
\|/ / / / / /