Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 0 deletions

diff --git a/db/migrate/20191023093207_add_comment_actions_to_services.rb b/db/migrate/20191023093207_add_comment_actions_to_services.rb
new file mode 100644
index 00000000000..f3fc12ac7c7
--- /dev/null
+++ b/db/migrate/20191023093207_add_comment_actions_to_services.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddCommentActionsToServices < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default(:services, :comment_on_event_enabled, :boolean, default: true)
+  end
+
+  def down
+    remove_column(:services, :comment_on_event_enabled)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9dccceb79f0..2de76973ca7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -3577,6 +3577,7 @@ ActiveRecord::Schema.define(version: 2019_11_24_150431) do
     t.boolean "confidential_note_events", default: true
     t.boolean "deployment_events", default: false, null: false
     t.string "description", limit: 500
+    t.boolean "comment_on_event_enabled", default: true, null: false
     t.index ["project_id"], name: "index_services_on_project_id"
     t.index ["template"], name: "index_services_on_template"
     t.index ["type"], name: "index_services_on_type"