diff options
author | Keith Pitt <me@keithpitt.com> | 2014-10-08 16:33:53 +0800 |
---|---|---|
committer | Keith Pitt <me@keithpitt.com> | 2014-10-08 16:33:53 +0800 |
commit | 4c7da578f200f0bc721cc2cae27eb2b25f96e8dd (patch) | |
tree | 565b5b7746bc2cff8e46883b4d1836dfaa0246ef /doc/api/projects.md | |
parent | 76594d474ca6d04c2e608e7b3df1229729288f14 (diff) | |
parent | 928178deb9d582d7537a57983ff9e695f07dab1f (diff) | |
download | gitlab-ce-4c7da578f200f0bc721cc2cae27eb2b25f96e8dd.tar.gz |
Merge branch 'master' into buildbox-service
Conflicts:
app/models/project.rb
Diffstat (limited to 'doc/api/projects.md')
-rw-r--r-- | doc/api/projects.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md index 8385e11b805..dfe3502b6e4 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -447,6 +447,7 @@ Parameters: - `push_events` - Trigger hook on push events - `issues_events` - Trigger hook on issues events - `merge_requests_events` - Trigger hook on merge_requests events +- `tag_push_events` - Trigger hook on push_tag events ### Edit project hook @@ -464,6 +465,7 @@ Parameters: - `push_events` - Trigger hook on push events - `issues_events` - Trigger hook on issues events - `merge_requests_events` - Trigger hook on merge_requests events +- `tag_push_events` - Trigger hook on push_tag events ### Delete project hook |