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

	Commit message (Expand)	Author	Age	Files	Lines
*	Freeze the middleware stack after it's built	Jeremy Kemper	2012-04-20	3	-18/+26
*	Merge pull request #5900 from amatsuda/ar_mysql_pk_with_using_option	Jeremy Kemper	2012-04-19	2	-1/+31
\|\
\| *	be sure to currectly fetch PK name from MySQL even if the PK has some custom ...	Akira Matsuda	2012-04-19	2	-1/+31
\|/
*	Remove unused generator options. This was added for the removed rails new --http	Santiago Pastorino	2012-04-18	3	-9/+0
*	Add hook for add_resource_route	Santiago Pastorino	2012-04-18	3	-7/+16
*	Merge pull request #5891 from kennyj/remove_time_directory	Jeremy Kemper	2012-04-18	1	-5/+0
\|\
\| *	Remove unused code. We should use 'active_support/time'.	kennyj	2012-04-19	1	-5/+0
\|/
*	Merge pull request #5889 from juanazam/juan-master	Santiago Pastorino	2012-04-18	1	-0/+2
\|\
\| *	Add missing dependency for active_record_deprecated_finders	Juan Manuel Azambuja	2012-04-18	1	-0/+2
\|/
*	Merge pull request #5869 from LachyGroom/patch-1	Piotr Sarnacki	2012-04-17	1	-1/+1
\|\
\| *	Changes b tag to strong	CollectiveJam	2012-04-16	1	-1/+1
* \|	Merge pull request #5882 from vijaydev/fix_generated_attribute_build	Santiago Pastorino	2012-04-17	1	-2/+4
\|\ \
\| * \|	the index option is always created if the type is one of references or belong...	Vijay Dev	2012-04-18	1	-2/+4
\|/ /
* \|	let's not use `and` in place of `&&`	Vijay Dev	2012-04-18	1	-1/+1
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-18	11	-27/+63
\|\ \
\| * \|	let's keep the slash in the return value instead of the path variable [ci skip]	Vijay Dev	2012-04-18	1	-2/+2
\| * \|	Fix confusing example in ActiveModel::Errors	Thibaut Courouble	2012-04-17	1	-2/+2
\| * \|	Warn about do end syntax in redirect option	Oscar Del Ben	2012-04-17	1	-0/+3
\| * \|	Fix redirect with block example	Alexey Vakhov	2012-04-17	1	-3/+3
\| * \|	Fix example in flash middleware	Alexey Vakhov	2012-04-17	1	-1/+1
\| * \|	Fix typo where a table name in a join was singular.	Don Petersen	2012-04-16	1	-1/+1
\| * \|	Fixed a typo in migrations	luke	2012-04-15	1	-1/+1
\| * \|	fix ActiveModel::Validations::Callbacks doc	Jan Xie	2012-04-15	1	-1/+2
\| * \|	fix bad format [ci skip]	Michael de Silva	2012-04-14	1	-7/+7
\| * \|	Improve example in initializer	Oscar Del Ben	2012-04-14	1	-1/+1
\| * \|	SQL query formatting	Bertrand Chardon	2012-04-13	1	-2/+7
\| * \|	Fix comment in AD http response	Alexey Vakhov	2012-04-13	1	-1/+1
\| * \|	Fix HTML sanitizer allowed_css_properties comment	Alexey Vakhov	2012-04-13	1	-1/+1
\| * \|	Revert "Added documentation to explain what happens if you don't set any valu...	Rodrigo Flores	2012-04-12	1	-5/+2
\| * \|	Added documentation to explain what happens if you don't set any values for t...	Rodrigo Flores	2012-04-12	1	-2/+5
\| * \|	Add documentation to detail passing of an object as the second	Michael de Silva	2012-04-13	1	-0/+27
\| * \|	Fix further typos in ActiveSupport::Notifications	Michael de Silva	2012-04-13	1	-4/+4
\| * \|	Fix rdoc typo in ActiveSupport::Notifications	Michael de Silva	2012-04-13	1	-1/+1
\| * \|	Fix typo on the add_index.	kennyj	2012-04-13	1	-1/+1
* \| \|	Revert "Merge pull request #5864 from vatrai/remove_ordered_hash_autoload"	Aaron Patterson	2012-04-17	1	-0/+1
* \| \|	Merge pull request #5871 from rafaelfranca/patch-1	José Valim	2012-04-17	1	-5/+0
\|\ \ \
\| * \| \|	Remove unused test code.	Rafael Mendonça França	2012-04-16	1	-5/+0
\| \| \|/ \| \|/\|
* / \|	Fix test	Santiago Pastorino	2012-04-16	1	-2/+2
\|/ /
* \|	Merge pull request #5864 from vatrai/remove_ordered_hash_autoload	Aaron Patterson	2012-04-16	1	-1/+0
\|\ \
\| * \|	remove autoload for OrderedHash, usages removed already	Vishnu Atrai	2012-04-16	1	-1/+0
\|/ /
* \|	Merge pull request #5835 from asanghi/master	Jeremy Kemper	2012-04-16	1	-1/+1
\|\ \
\| * \|	Hey, let's just make it easier for everyone and dump the unmaintained ruby-de...	Aditya Sanghi	2012-04-14	1	-1/+1
* \| \|	Relax multi_json dependency to allow any 1.3 -> 1.x instead of just 1.3.x	Jeremy Kemper	2012-04-16	1	-1/+1
* \| \|	Merge pull request #5863 from rosenfeld/explicit-log-level	Jeremy Kemper	2012-04-16	1	-2/+2
\|\ \ \
\| * \| \|	Make log_level explicit in production.rb template	Rodrigo Rosenfeld Rosas	2012-04-16	1	-2/+2
\|/ / /
* \| \|	Merge pull request #5860 from arunagw/multi_json_upgrade_fix	Piotr Sarnacki	2012-04-16	2	-4/+4
\|\ \ \
\| * \| \|	fixed broken build after multi_json upgrade	Arun Agrawal	2012-04-16	2	-4/+4
\|/ / /
* \| \|	Merge pull request #5856 from arunagw/build_fix_master	Piotr Sarnacki	2012-04-16	2	-8/+6
\|\ \ \
\| * \| \|	fix scaffold_generator_test.rb and model_generator_test.rb	Arun Agrawal	2012-04-16	2	-8/+6
* \| \| \|	Merge pull request #5858 from bsodmike/master	Vijay Dev	2012-04-16	3	-3/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \|