Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 0 deletions

diff --git a/db/migrate/20200202100932_add_service_desk_project_key.rb b/db/migrate/20200202100932_add_service_desk_project_key.rb
new file mode 100644
index 00000000000..d42ed4159e4
--- /dev/null
+++ b/db/migrate/20200202100932_add_service_desk_project_key.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddServiceDeskProjectKey < ActiveRecord::Migration[5.2]
+  DOWNTIME = false
+
+  def change
+    add_column :service_desk_settings, :project_key, :string, limit: 255
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0fa15317003..c69be4844ff 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -3797,6 +3797,7 @@ ActiveRecord::Schema.define(version: 2020_02_04_131054) do
   create_table "service_desk_settings", primary_key: "project_id", id: :bigint, default: nil, force: :cascade do |t|
     t.string "issue_template_key", limit: 255
     t.string "outgoing_name", limit: 255
+    t.string "project_key", limit: 255
   end
 
   create_table "services", id: :serial, force: :cascade do |t|