diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-03 14:00:33 +0300 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2018-04-05 09:41:56 +0300 |
| commit | 52967b107b7b2f1472b4c005f70f21346079cd95 (patch) | |
| tree | 12e99d4fe27f69af53920bd4db3a81e473def642 /db/schema.rb | |
| parent | 98106ec54e439455f545f3df15332a28b9b0c969 (diff) | |
Merge branch 'jej/mattermost-notification-confidentiality-10-6' into 'security-10-6'
[10.6] Prevent notes on confidential issues from being sent to chat
See merge request gitlab/gitlabhq!2366
# Conflicts:
# app/helpers/services_helper.rb
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index 06fc1a9d7e9..25e7d720761 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1684,6 +1684,7 @@ ActiveRecord::Schema.define(version: 20180327101207) do t.boolean "confidential_issues_events", default: true, null: false t.boolean "commit_events", default: true, null: false t.boolean "job_events", default: false, null: false + t.boolean "confidential_note_events", default: true end add_index "services", ["project_id"], name: "index_services_on_project_id", using: :btree @@ -2022,6 +2023,7 @@ ActiveRecord::Schema.define(version: 20180327101207) do t.boolean "confidential_issues_events", default: false, null: false t.boolean "repository_update_events", default: false, null: false t.boolean "job_events", default: false, null: false + t.boolean "confidential_note_events" end add_index "web_hooks", ["project_id"], name: "index_web_hooks_on_project_id", using: :btree |