Add functionality to collapse outdated diff comments regardless of discussion resolution

2 files changed, 19 insertions, 0 deletions

diff --git a/db/migrate/20170825154015_collapse_outdated_diff_comments.rb b/db/migrate/20170825154015_collapse_outdated_diff_comments.rb
new file mode 100644
index 00000000000..cbfdd3ba2c2
--- /dev/null
+++ b/db/migrate/20170825154015_collapse_outdated_diff_comments.rb
@@ -0,0 +1,18 @@
+# rubocop:disable Migration/AddColumnWithDefaultToLargeTable
+class CollapseOutdatedDiffComments < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default(:projects,
+                            :collapse_outdated_diff_comments,
+                            :boolean,
+                            default: false)
+  end
+
+  def down
+    remove_column(:projects, :collapse_outdated_diff_comments)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f980667a38f..02b365a8743 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1202,6 +1202,7 @@ 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 "collapse_outdated_diff_comments", 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"