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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|/ / / / /
* \| \| \| \|	Merge pull request #1328 from flippingbits/cleanup_engine_generator	José Valim	2011-05-26	3	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	Use global namespace Rails	Stefan Sprenger	2011-05-26	2	-2/+2
\| * \| \| \| \|	Use plugin name consistently	Stefan Sprenger	2011-05-26	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #1324 from dmathieu/no_error_on_invalid_format	José Valim	2011-05-26	2	-1/+7
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	don't raise an exception if the format isn't recognized	dmathieu	2011-05-26	2	-1/+7
* \| \| \| \|	Merge pull request #1315 from ardavis/master	José Valim	2011-05-25	2	-2/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Added a space to the comment_if helper for formatting purposes	Andrew Davis	2011-05-25	1	-1/+1
\| * \| \| \|	Accidentally added extra IDE files, removed them.	Andrew Davis	2011-05-25	8	-342/+0
\| * \| \| \|	Removed unnecessary space in application.rb for formatting	Andrew Davis	2011-05-25	9	-1/+343
* \| \| \| \|	Merge pull request #1316 from guilleiguaran/railties-changelog	Aaron Patterson	2011-05-25	1	-0/+7
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Updating Railties changelog	Guillermo Iguaran	2011-05-25	1	-0/+7
\|/ / / /
* \| \| \|	Merge pull request #1312 from joshk/remove_active_support_deprecations	José Valim	2011-05-25	15	-648/+3
\|\ \ \ \
\| * \| \| \|	Removed deprecated methods and related tests from ActiveSupport	Josh Kalderimis	2011-05-25	15	-648/+3
\|/ / / /
* \| \| \|	Merge pull request #1311 from kuldarkrabbi/master	José Valim	2011-05-25	1	-1/+0
\|\ \ \ \
\| * \| \| \|	action_view/template/handler has been removed	Kuldar Krabbi	2011-05-25	1	-1/+0
* \| \| \| \|	Merge branch 'master' of github.com:rails/rails	Xavier Noria	2011-05-25	12	-162/+4
\|\\| \| \| \|
\| * \| \| \|	Merge pull request #1285 from joshk/remove_active_record_deprecations	Aaron Patterson	2011-05-25	12	-162/+4
\| \|\ \ \ \
\| \| * \| \| \|	removed deprecated methods, and related tests, from ActiveRecord	Josh Kalderimis	2011-05-25	12	-162/+4
* \| \| \| \| \|	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-05-25	94	-363/+408
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Typo; changed 'Febuary' to 'February'	Lee Reilly	2011-05-25	1	-1/+1
\| * \| \| \| \|	Typo; changed 'colour' to 'color' & 'analysed' to 'analyzed'	Lee Reilly	2011-05-25	1	-3/+3
\| * \| \| \| \|	Typo; changed 'enviroment' to 'environment'	Lee Reilly	2011-05-25	1	-1/+1
\| * \| \| \| \|	prefer validates :x in place of validates_x_of	Vijay Dev	2011-05-26	1	-25/+25
\| * \| \| \| \|	fixed minor errors	Vijay Dev	2011-05-26	1	-3/+4
\| * \| \| \| \|	changes validates_format & numericality to newer syntax	Vijay Dev	2011-05-25	1	-6/+6
\| * \| \| \| \|	changes validates_inclusion & exclusion to newer syntax	Vijay Dev	2011-05-25	1	-7/+7