root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix "Confidential comments" button not saving in project hooks 

Closes #50440
This commit is contained in:
Stan Hu 2018-08-17 16:15:21 -07:00
parent 74eec89ebe
commit 0d95b6bf61
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/concerns/triggerable_hooks.rb
View File

@ -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,

5
changelogs/unreleased/sh-fix-confidential-note-option.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix "Confidential comments" button not saving in project hooks
merge_request: 21289
author:
type: fixed

1
spec/controllers/projects/hooks_controller_spec.rb
View File

@ -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,