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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #16212 from ↵	Rafael Mendonça França	2014-07-18	1	-1/+2
\|\ \| \| \| \| \| \| \| \| \| \|	aantix/additional_migration_conflict_help_messaging Additional help messaging to help the user resolve a conflicted migration
\| *	Modified migration conflict message to remove the string concatenation.	Jim Jones	2014-07-18	1	-3/+3
\| \|
\| *	Added additional help messaging when there's scaffolding being generated and ↵	Jim Jones	2014-07-17	1	-1/+2
\|/ \| \| \| \| \|	a migration already exists for the resource. The user is now alerted that they are able to skip the conflicted migration file via the --skip option.
*	require actions rather than create_file	Aaron Patterson	2014-03-13	1	-1/+1
\| \| \| \| \| \| \|	thor's create_file seems to have a circular dependency on itself when used with our constant loading stuff. fixes #14319
*	Add CreateMigration action	Gert Goet	2014-01-28	1	-0/+68
	This Thor-action isolates the logic whether to (over-)write migration and what is shown to the user. It's modelled after Thor's CreateFile-action. This solves the issue that removing a non-existing migration, tried to remove the template-path (#13588). Related issues: #12674