Merge branch 'master' into buildbox-service

Conflicts:
	app/models/project.rb

1 files changed, 14 insertions, 2 deletions

diff --git a/lib/api/project_hooks.rb b/lib/api/project_hooks.rb
index 79c3d122d32..7d056b9bf58 100644
--- a/lib/api/project_hooks.rb
+++ b/lib/api/project_hooks.rb
@@ -38,7 +38,13 @@ module API
       #   POST /projects/:id/hooks
       post ":id/hooks" do
         required_attributes! [:url]
-        attrs = attributes_for_keys [:url, :push_events, :issues_events, :merge_requests_events]
+        attrs = attributes_for_keys [
+          :url,
+          :push_events,
+          :issues_events,
+          :merge_requests_events,
+          :tag_push_events
+        ]
         @hook = user_project.hooks.new(attrs)
 
         if @hook.save
@@ -62,7 +68,13 @@ module API
       put ":id/hooks/:hook_id" do
         @hook = user_project.hooks.find(params[:hook_id])
         required_attributes! [:url]
-        attrs = attributes_for_keys [:url, :push_events, :issues_events, :merge_requests_events]
+        attrs = attributes_for_keys [
+          :url,
+          :push_events,
+          :issues_events,
+          :merge_requests_events,
+          :tag_push_events
+        ]
 
         if @hook.update_attributes attrs
           present @hook, with: Entities::ProjectHook