Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 25 insertions, 0 deletions

diff --git a/db/migrate/20200703035021_add_notes_to_timelogs.rb b/db/migrate/20200703035021_add_notes_to_timelogs.rb
new file mode 100644
index 00000000000..d711fd0400d
--- /dev/null
+++ b/db/migrate/20200703035021_add_notes_to_timelogs.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddNotesToTimelogs < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      add_column :timelogs, :note_id, :integer
+    end
+    add_concurrent_index :timelogs, :note_id
+    add_concurrent_foreign_key :timelogs, :notes, column: :note_id
+  end
+
+  def down
+    remove_foreign_key_if_exists :timelogs, column: :note_id
+    remove_concurrent_index :timelogs, :note_id
+    with_lock_retries do
+      remove_column :timelogs, :note_id
+    end
+  end
+end