diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-08-31 21:29:25 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-08-31 21:29:25 +0000 |
| commit | 9d9429589b417ceae4989925c297958a21f36544 (patch) | |
| tree | 079a380bdfe5f6c4e9626d59f25a905f73656a03 | |
| parent | 472f2d566633df6c1dee1f703b06958b9a0a2cd8 (diff) | |
| parent | 0d95b6bf61d43314869a25c0071d81de247a7c2c (diff) | |
| download | gitlab-ce-9d9429589b417ceae4989925c297958a21f36544.tar.gz | |
Merge branch 'sh-fix-confidential-note-option' into 'master'
Fix "Confidential comments" button not saving in project hooks
Closes #50440
See merge request gitlab-org/gitlab-ce!21289
| -rw-r--r-- | app/models/concerns/triggerable_hooks.rb | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-confidential-note-option.yml | 5 | ||||
| -rw-r--r-- | spec/controllers/projects/hooks_controller_spec.rb | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/app/models/concerns/triggerable_hooks.rb b/app/models/concerns/triggerable_hooks.rb index f55ab2fcaf3..223a61119e5 100644 --- a/app/models/concerns/triggerable_hooks.rb +++ b/app/models/concerns/triggerable_hooks.rb @@ -6,6 +6,7 @@ module TriggerableHooks push_hooks: :push_events, tag_push_hooks: :tag_push_events, issue_hooks: :issues_events, + confidential_note_hooks: :confidential_note_events, confidential_issue_hooks: :confidential_issues_events, note_hooks: :note_events, merge_request_hooks: :merge_requests_events, diff --git a/changelogs/unreleased/sh-fix-confidential-note-option.yml b/changelogs/unreleased/sh-fix-confidential-note-option.yml new file mode 100644 index 00000000000..14d70281760 --- /dev/null +++ b/changelogs/unreleased/sh-fix-confidential-note-option.yml @@ -0,0 +1,5 @@ +--- +title: Fix "Confidential comments" button not saving in project hooks +merge_request: 21289 +author: +type: fixed diff --git a/spec/controllers/projects/hooks_controller_spec.rb b/spec/controllers/projects/hooks_controller_spec.rb index 0f3033b0933..7d3a8c3d0d3 100644 --- a/spec/controllers/projects/hooks_controller_spec.rb +++ b/spec/controllers/projects/hooks_controller_spec.rb @@ -30,6 +30,7 @@ describe Projects::HooksController do tag_push_events: true, merge_requests_events: true, issues_events: true, + confidential_note_events: true, confidential_issues_events: true, note_events: true, job_events: true, |