diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-02 11:46:45 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-02 11:46:45 +0000 |
| commit | 2023511753d75545aa76968a2991dc962f7a99db (patch) | |
| tree | ea0ea32f4ea3c61ef25717840dcf0cd54c136a89 /lib/api | |
| parent | ee6d087ef2a7bbfede43741e04e850b363c74cb3 (diff) | |
| parent | f77be11cb9caa62cdd4690a53c73b6d34e102148 (diff) | |
| download | gitlab-ce-2023511753d75545aa76968a2991dc962f7a99db.tar.gz | |
Merge branch 'gpocentek/gitlab-ce-api-webhook-token' into 'master'
This MR adds support for the `token` attribute in the project hook API.
Feature requested on a dependant project: https://github.com/gpocentek/python-gitlab/issues/170
See merge request !7220
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/project_hooks.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/api/project_hooks.rb b/lib/api/project_hooks.rb index 14f5be3b5f6..dd93a85dc54 100644 --- a/lib/api/project_hooks.rb +++ b/lib/api/project_hooks.rb @@ -47,7 +47,8 @@ module API :build_events, :pipeline_events, :wiki_page_events, - :enable_ssl_verification + :enable_ssl_verification, + :token ] @hook = user_project.hooks.new(attrs) @@ -82,7 +83,8 @@ module API :build_events, :pipeline_events, :wiki_page_events, - :enable_ssl_verification + :enable_ssl_verification, + :token ] if @hook.update_attributes attrs |