Merge branch 'master' of github.com:python-gitlab/python-gitlab

Gauvain Pocentek · Gauvain Pocentek · commit 3bc3e607e3e5 · 2017-11-08T06:59:49.000+01:00
diff --git a/docs/gl_objects/builds.py b/docs/gl_objects/builds.py
@@ -34,7 +34,8 @@
 # end trigger get
 
 # trigger create
-trigger = project.triggers.create({})
+trigger = project.triggers.create({}) # v3
+trigger = project.triggers.create({'description': 'mytrigger'}) # v4
 # end trigger create
 
 # trigger delete
diff --git 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
@@ -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'),
