diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-04-06 12:11:24 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-06 12:11:24 +0100 |
| commit | 99b6506df8656fe09f37067c99121786733a6016 (patch) | |
| tree | 6a3dcf3f9dcd5d85b4830c3352a873d16507e243 /lib/api/project_hooks.rb | |
| parent | 7fa7ea4b8b55df66ae17c21d64cf30cf571dea9a (diff) | |
| parent | 41ee09c9a06b41d904977def6e7824928f27596a (diff) | |
| download | gitlab-ce-fl-fix-annoying-actions.tar.gz | |
Merge branch 'master' into fl-fix-annoying-actionsfl-fix-annoying-actions
* master: (91 commits)
[Rails5] Update `type_cast_*_database` methods
Add confirmation modal to "Change username"
Add noteableType to mock data object
Set `noteable_type` to use in notesApp
Return noteableType from app initial config
Use noteable type map from constants
Add map for supported noteable types
Polish design of domain verification for Gitlab Pages
Add changelog item
Resolve "Show `failure_reason` and upgrade tooltips of jobs"
Include subgroup issues when searching for group issues using the API
Use the GitLab version as part of the appearances cache key
Fix rubocop
Fix rubocop
Deleting a MR you are assigned to should decrements counter
Improve specs and docs
Fix more specs
Fix specs
Show issues of subgroups in group-level issue board
Override the Prometheus server name
...
Diffstat (limited to 'lib/api/project_hooks.rb')
| -rw-r--r-- | lib/api/project_hooks.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/project_hooks.rb b/lib/api/project_hooks.rb index f82241058e5..68921ae439b 100644 --- a/lib/api/project_hooks.rb +++ b/lib/api/project_hooks.rb @@ -14,6 +14,7 @@ module API optional :merge_requests_events, type: Boolean, desc: "Trigger hook on merge request events" optional :tag_push_events, type: Boolean, desc: "Trigger hook on tag push events" optional :note_events, type: Boolean, desc: "Trigger hook on note(comment) events" + optional :confidential_note_events, type: Boolean, desc: "Trigger hook on confidential note(comment) events" optional :job_events, type: Boolean, desc: "Trigger hook on job events" optional :pipeline_events, type: Boolean, desc: "Trigger hook on pipeline events" optional :wiki_page_events, type: Boolean, desc: "Trigger hook on wiki events" |