Skip to content

Commit

Permalink
Modified migration conflict message to remove the string concatenation.
Browse files Browse the repository at this point in the history
  • Loading branch information
aantix committed Jul 18, 2014
1 parent af3cf61 commit cc1ad78
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions railties/lib/rails/generators/actions/create_migration.rb
Expand Up @@ -54,9 +54,9 @@ def on_conflict_behavior(&block)
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

Expand Down

0 comments on commit cc1ad78

Please sign in to comment.