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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #10488 from neerajdotname/10419-b	Rafael Mendonça França	2013-05-06	1	-2/+2
\|\
\| *	fix failing test caused by 3771e4d511	Neeraj Singh	2013-05-06	1	-2/+2
* \|	let rake tasks be robust to a missing RDoc in Rubinius [Fixes #10462]	Xavier Noria	2013-05-06	1	-45/+56
* \|	Merge pull request #10437 from neerajdotname/10419	Rafael Mendonça França	2013-05-06	3	-1/+49
\|\\|
\| *	raise IrreversibleMigration if no column given	Neeraj Singh	2013-05-06	3	-1/+49
\|/
*	Merge pull request #10486 from vipulnsward/remove_variable	Rafael Mendonça França	2013-05-06	1	-1/+0
\|\
\| *	remove unused variable	Vipul A M	2013-05-06	1	-1/+0
\|/
*	Merge pull request #10453 from vipulnsward/destructive_sort	Jeremy Kemper	2013-05-05	1	-1/+1
\|\
\| *	use destructive sort on array in Hash#to_param for performance gains.	Vipul A M	2013-05-05	1	-1/+1
* \|	Merge pull request #10480 from juno/fix-typo	Steve Klabnik	2013-05-05	1	-1/+1
\|\ \
\| * \|	Fix typo in documentation comment	Junya Ogura	2013-05-06	1	-1/+1
\|/ /
* \|	Merge pull request #10467 from akalyaev/set-correct-backend-for-nokogirisax-e...	Rafael Mendonça França	2013-05-05	1	-3/+3
\|\ \
\| * \|	use nokogirisax as a backend	Anton Kalyaev	2013-05-05	1	-3/+3
* \| \|	Merge pull request #10476 from prathamesh-sonpatki/gitignore	Rafael Mendonça França	2013-05-05	3	-3/+3
\|\ \ \
\| * \| \|	Updated link to to GitHub article about ignoring files [ci skip]	Prathamesh Sonpatki	2013-05-05	3	-3/+3
\|/ / /
* \| \|	Merge pull request #10466 from prathamesh-sonpatki/scaffold-assets	Carlos Antonio da Silva	2013-05-05	1	-4/+4
\|\ \ \
\| * \| \|	Fixes warning 'method redefined' in scaffold generators tests	Prathamesh Sonpatki	2013-05-05	1	-4/+4
\| \|/ /
* \| \|	Merge pull request #10468 from rimidl/add-missing-require-to-actionview-looku...	Carlos Antonio da Silva	2013-05-05	1	-0/+1
\|\ \ \
\| * \| \|	Added missing `require` to ActionView::LookupContext	Vladimir Strakhov	2013-05-05	1	-0/+1
\| \|/ /
* \| \|	Merge pull request #10472 from prathamesh-sonpatki/github	Carlos Antonio da Silva	2013-05-05	4	-14/+14
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Github -> GitHub [ci skip]	Prathamesh Sonpatki	2013-05-05	4	-14/+14
\|/ /
* \|	Merge pull request #10465 from raphweiner/rake_install_depend_on_build	Rafael Mendonça França	2013-05-04	1	-1/+1
* \|	Merge pull request #10464 from arkiver/master	Rafael Mendonça França	2013-05-04	2	-2/+2
\|\ \
\| * \|	fix to remove warning on postgres adapter test.	Akshay Khole	2013-05-05	1	-1/+1
\| * \|	Changing method call according to coding conventions	Akshay Khole	2013-05-05	1	-1/+1
\|/ /
* \|	Merge pull request #10463 from prathamesh-sonpatki/dir	Rafael Mendonça França	2013-05-04	1	-1/+1
\|\ \
\| * \|	dir -> directory [ci skip]	Prathamesh Sonpatki	2013-05-04	1	-1/+1
\|/ /
* \|	Use Ruby 1.9 syntax	Rafael Mendonça França	2013-05-04	1	-2/+2
* \|	Review the CHANGELOG entry [ci skip]	Rafael Mendonça França	2013-05-04	1	-1/+2
* \|	Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-master	Rafael Mendonça França	2013-05-04	3	-0/+20
\|\ \
\| * \|	Fixes Scaffold generator with --assets=false	Arun Agrawal	2013-05-04	3	-0/+20
\|/ /
* \|	Merge pull request #10458 from bwbuchanan/issue-10451	Rafael Mendonça França	2013-05-04	3	-2/+18
\|\ \
\| * \|	Make SchemaDumper emit "id: :uuid" when appropriate. Fixes #10451.	Brian Buchanan	2013-05-03	3	-2/+18
\| \|/
* \|	Merge pull request #10436 from NARKOZ/keep-images	Rafael Mendonça França	2013-05-04	3	-0/+6
\|\ \
\| * \|	generate 'app/assets/images' directory when creating new rails app	Nihad Abbasov	2013-05-04	3	-0/+6
* \| \|	Merge pull request #10461 from rwz/master	Rafael Mendonça França	2013-05-04	2	-2/+2
\|\ \ \
\| * \| \|	Relaxed jbuilder dependency in Gemfile template	Pavel Pravosud	2013-05-04	3	-3/+3
* \| \| \|	Merge pull request #10457 from zenspider/squishy_test_order_dependencies	Aaron Patterson	2013-05-03	4	-6/+27
\|\ \ \ \
\| * \| \| \|	Fixed bad tests to clean up after themselves.	Ryan Davis	2013-05-03	4	-6/+27
\|/ / / /
* \| \| \|	Merge pull request #10452 from rubys/rails_version_test	Rafael Mendonça França	2013-05-03	1	-0/+5
\|\ \ \ \
\| * \| \| \|	Add a test case for comparing Rails versions	Sam Ruby	2013-05-03	1	-0/+5
\| \| \|_\|/ \| \|/\| \|
* / \| \|	Squashed commit of the following:	Aaron Patterson	2013-05-03	17	-174/+7
\|/ / /
* \| \|	Fix generating route from engine to other engine	Piotr Sarnacki	2013-05-03	3	-1/+48
* \| \|	Merge pull request #9426 from exviva/nested_attributes_reuse_existing_new_record	Jon Leighton	2013-05-03	4	-11/+75
\|\ \ \
\| * \| \|	Do not overwrite manually built records during one-to-one nested attribute as...	Olek Janiszewski	2013-05-03	4	-11/+75
\|/ / /
* \| \|	Merge pull request #10417 from jholton/fix_association_auto_save	Jon Leighton	2013-05-03	3	-12/+34
\|\ \ \
\| * \| \|	destroys association records before saving/inserting new association records	Johnny Holton	2013-05-02	3	-12/+34
* \| \| \|	Merge pull request #10413 from vipulnsward/change_grouping	Carlos Antonio da Silva	2013-05-03	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Use faster Array.new instead of []*padding	Vipul A M	2013-05-02	1	-1/+1
* \| \| \| \|	Revert "Merge pull request #10433 from wangjohn/making_callbacks_more_perform...	Jon Leighton	2013-05-03	1	-33/+11