diff options
| author |  jesopo | 2019-10-18 13:28:24 +0100 |
|---|---|---|
| committer | jesopo | 2019-10-18 13:28:24 +0100 |
| commit | afd6800c9838ae64aeb9a892938741685acc7c14 (patch) | |
| tree | f05afd67a6f3c54bfb50eb8624c57af15b80ef5d /modules/git_webhooks/gitlab.py | |
| parent | better README.md webhook wording (diff) | |
| signature | ||
show merge_request/merge events
Diffstat (limited to 'modules/git_webhooks/gitlab.py')
| -rw-r--r-- | modules/git_webhooks/gitlab.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/git_webhooks/gitlab.py b/modules/git_webhooks/gitlab.py index 4b8420a7..cf0923c7 100644 --- a/modules/git_webhooks/gitlab.py +++ b/modules/git_webhooks/gitlab.py @@ -7,11 +7,12 @@ EVENT_CATEGORIES = { ], "code": ["push"], "pr-minimal": [ - "merge_request/open", "merge_request/close", "merge_request/reopen" + "merge_request/open", "merge_request/close", "merge_request/reopen", + "merge_request/merge" ], "pr": [ "merge_request/open", "merge_request/close", "merge_request/reopen", - "merge_request/update", + "merge_request/update", "merge_request/merge" ], "pr-all": ["merge_request"], "issue-minimal": [ @@ -45,7 +46,8 @@ ISSUE_ACTIONS = { "open": "opened", "close": "closed", "reopen": "reopened", - "update": "updated" + "update": "updated", + "merge": "merged" } class GitLab(object): |