diff options
| author | Gauvain Pocentek <gauvain@pocentek.net> | 2017-11-08 06:59:49 +0100 |
|---|---|---|
| committer | Gauvain Pocentek <gauvain@pocentek.net> | 2017-11-08 06:59:49 +0100 |
| commit | 3bc3e607e3e52cc5e676f379eca31316ad9c330a (patch) | |
| tree | 1311077aa0db9dc2b91172db2d16c0d38fb557da /gitlab | |
| parent | 4fb2e439803bd55868b91827a5fbaa448f1dff56 (diff) | |
| parent | 30b1c03efe5b1927500103f5f9e6fb5b5ad9d312 (diff) | |
| download | gitlab-3bc3e607e3e52cc5e676f379eca31316ad9c330a.tar.gz | |
Merge branch 'master' of github.com:python-gitlab/python-gitlab
Diffstat (limited to 'gitlab')
| -rw-r--r-- | gitlab/v3/objects.py | 1 | ||||
| -rw-r--r-- | gitlab/v4/objects.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/gitlab/v3/objects.py b/gitlab/v3/objects.py index 338d219..ebe0785 100644 --- a/gitlab/v3/objects.py +++ b/gitlab/v3/objects.py @@ -1675,6 +1675,7 @@ class ProjectService(GitlabObject): # Optional fields 'username', 'password', 'jira_issue_transition_id')), + 'mattermost': (('webhook',), ('username', 'channel')), 'pivotaltracker': (('token', ), tuple()), 'pushover': (('api_key', 'user_key', 'priority'), ('device', 'sound')), 'redmine': (('new_issue_url', 'project_url', 'issues_url'), diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py index 6d7512b..9be0d05 100644 --- a/gitlab/v4/objects.py +++ b/gitlab/v4/objects.py @@ -1877,6 +1877,7 @@ class ProjectServiceManager(GetMixin, UpdateMixin, DeleteMixin, RESTManager): ('new_issue_url', 'project_url', 'issues_url', 'api_url', 'description', 'username', 'password', 'jira_issue_transition_id')), + 'mattermost': (('webhook',), ('username', 'channel')), 'pivotaltracker': (('token', ), tuple()), 'pushover': (('api_key', 'user_key', 'priority'), ('device', 'sound')), 'redmine': (('new_issue_url', 'project_url', 'issues_url'), |