Merge branch 'web_hook_fix' into 'master'

Fix group web_hooks

https://dev.gitlab.org/gitlab/gitlabhq/issues/2452

See merge request !438

CHANGELOG-EE

-v7.13.1
+v 7.13.2
+  - Fix group web hook
+
+v 7.13.1
   - Merge community edition changes for version 7.13.1
   - Fix: "Rebase before merge" doesn't work when source branch is in the same project
 

app/models/project.rb

@@ -512,7 +512,7 @@ class Project < ActiveRecord::Base
     end
     if group
       group.hooks.send(hooks_scope).each do |hook|
-        hook.async_execute(data)
+        hook.async_execute(data, hooks_scope.to_s)
       end
     end
   end

spec/models/project_spec.rb

@@ -365,6 +365,23 @@ describe Project do
     end
   end
 
+  describe :execute_hooks do
+    it "triggers project and group hooks" do
+      group = create :group, name: 'gitlab'
+      project = create(:project, name: 'gitlabhq', namespace: group)
+      project_hook = create(:project_hook, push_events: true, project: project)
+      group_hook = create(:group_hook, push_events: true, group: group)
+
+      stub_request(:post, project_hook.url)
+      stub_request(:post, group_hook.url)
+
+      expect_any_instance_of(ProjectHook).to receive(:async_execute).and_return(true)
+      expect_any_instance_of(GroupHook).to receive(:async_execute).and_return(true)
+
+      project.execute_hooks({}, :push_hooks)
+    end
+  end
+
   describe :avatar_url do
     subject { project.avatar_url }