Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 0 deletions

diff --git a/db/migrate/20200222055543_add_confidential_to_note.rb b/db/migrate/20200222055543_add_confidential_to_note.rb
new file mode 100644
index 00000000000..03173f63a03
--- /dev/null
+++ b/db/migrate/20200222055543_add_confidential_to_note.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+class AddConfidentialToNote < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    with_lock_retries do
+      add_column :notes, :confidential, :boolean
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ac647a9eadf..f49b1af4ea9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2806,6 +2806,7 @@ ActiveRecord::Schema.define(version: 2020_02_24_163804) do
     t.text "change_position"
     t.boolean "resolved_by_push"
     t.bigint "review_id"
+    t.boolean "confidential"
     t.index ["author_id"], name: "index_notes_on_author_id"
     t.index ["commit_id"], name: "index_notes_on_commit_id"
     t.index ["created_at"], name: "index_notes_on_created_at"