aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorJim Jones <jjones@aantix.com>2014-07-18 08:51:36 -0700
committerJim Jones <jjones@aantix.com>2014-07-18 08:51:36 -0700
commitcc1ad787af462e03be5ff1805c3d176569cc1e2f (patch)
tree98490ceaf131784ff003afaea29f7f3d14ea898c /railties/lib/rails/generators
parentaf3cf61aa7e139b8e8b446b65494f14cfcc538ce (diff)
downloadrails-cc1ad787af462e03be5ff1805c3d176569cc1e2f.tar.gz
rails-cc1ad787af462e03be5ff1805c3d176569cc1e2f.tar.bz2
rails-cc1ad787af462e03be5ff1805c3d176569cc1e2f.zip
Modified migration conflict message to remove the string concatenation.
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/actions/create_migration.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/actions/create_migration.rb b/railties/lib/rails/generators/actions/create_migration.rb
index b4701b9591..71779b0a9c 100644
--- a/railties/lib/rails/generators/actions/create_migration.rb
+++ b/railties/lib/rails/generators/actions/create_migration.rb
@@ -54,9 +54,9 @@ module Rails
say_status :skip, :yellow
else
say_status :conflict, :red
- raise Error, "Another migration is already named #{migration_file_name}: " +
- "#{existing_migration}. Use --force to replace this migration" +
- " or --skip to ignore conflicted file."
+ raise Error, "Another migration is already named #{migration_file_name}: " \
+ "#{existing_migration}. Use --force to replace this migration " \
+ "or --skip to ignore conflicted file."
end
end