Merge pull request #5533 from mhfs/migration_blank_line_3_2

[3-2-stable] Remove blank line from generated migration

2 files changed, 2 insertions, 1 deletions

diff --git a/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb b/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
index d084a00ed7..aec5c429fe 100644
--- a/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
+++ b/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
@@ -5,7 +5,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
     add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
     <%- if attribute.has_index? -%>
     add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
-    <%- end %>
+    <%- end -%>
 <%- end -%>
   end
 <%- else -%>
diff --git a/railties/test/generators/migration_generator_test.rb b/railties/test/generators/migration_generator_test.rb
index 3f4e160988..8d49faacf1 100644
--- a/railties/test/generators/migration_generator_test.rb
+++ b/railties/test/generators/migration_generator_test.rb
@@ -37,6 +37,7 @@ class MigrationGeneratorTest < Rails::Generators::TestCase
       assert_method :change, content do |up|
         assert_match(/add_column :posts, :title, :string/, up)
         assert_match(/add_column :posts, :body, :text/, up)
+        assert_no_match(/\n\n/, up)
       end
     end
   end