Merge pull request #5532 from mhfs/migration_blank_line

Remove blank line from generated migration

activerecord/lib/rails/generators/active_record/migration/templates/migration.rb

@@ -5,7 +5,7 @@ def change
     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 -%>

railties/test/generators/migration_generator_test.rb

@@ -37,6 +37,7 @@ def test_add_migration_with_attributes
       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