Fix migration

2 files changed, 4 insertions, 12 deletions

diff --git a/db/migrate/20170825154015_resolve_outdated_diff_discussions.rb b/db/migrate/20170825154015_resolve_outdated_diff_discussions.rb
index 8ee474e908e..235530bb1e6 100644
--- a/db/migrate/20170825154015_resolve_outdated_diff_discussions.rb
+++ b/db/migrate/20170825154015_resolve_outdated_diff_discussions.rb
@@ -1,17 +1,9 @@
-class CollapseOutdatedDiffComments < ActiveRecord::Migration
+class ResolveOutdatedDiffDiscussions < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
 
   DOWNTIME = false
-  disable_ddl_transaction!
 
-  def up
-    add_column_with_default(:projects,
-                            :resolve_outdated_diff_discussions,
-                            :boolean,
-                            default: false)
-  end
-
-  def down
-    remove_column(:projects, :resolve_outdated_diff_discussions)
+  def change
+    add_column(:projects, :resolve_outdated_diff_discussions, :boolean)
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index c25ca40b906..981ce5425d3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1202,7 +1202,6 @@ ActiveRecord::Schema.define(version: 20170901071411) do
     t.boolean "public_builds", default: true, null: false
     t.boolean "last_repository_check_failed"
     t.datetime "last_repository_check_at"
-    t.boolean "resolve_outdated_diff_discussions", default: false, null: false
     t.boolean "container_registry_enabled"
     t.boolean "only_allow_merge_if_pipeline_succeeds", default: false, null: false
     t.boolean "has_external_issue_tracker"
@@ -1220,6 +1219,7 @@ ActiveRecord::Schema.define(version: 20170901071411) do
     t.string "ci_config_path"
     t.text "delete_error"
     t.integer "storage_version", limit: 2
+    t.boolean "resolve_outdated_diff_discussions"
   end
 
   add_index "projects", ["ci_id"], name: "index_projects_on_ci_id", using: :btree