Merge branch 'ce-to-ee' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee

app/models/hooks/service_hook.rb

 class ServiceHook < WebHook
   belongs_to :service
 
-<<<<<<< HEAD
-  def execute(data, hook_name = 'service_hook')
-    super(data, hook_name)
-=======
   def execute(data)
     WebHookService.new(self, data, 'service_hook').execute
->>>>>>> ce-com/master
   end
 end

app/views/layouts/nav/_admin.html.haml

@@ -18,12 +18,7 @@
       = link_to admin_broadcast_messages_path, title: 'Messages' do
         %span
           Messages
-<<<<<<< HEAD
-
-    = nav_link(controller: :hooks) do
-=======
     = nav_link(controller: [:hooks, :hook_logs]) do
->>>>>>> ce-com/master
       = link_to admin_hooks_path, title: 'Hooks' do
         %span
           System Hooks

app/views/projects/hooks/edit.html.haml

@@ -13,8 +13,6 @@
       = render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook }
 
       = f.submit 'Save changes', class: 'btn btn-create'
-<<<<<<< HEAD
-=======
       = link_to 'Test hook', test_namespace_project_hook_path(@project.namespace, @project, @hook), class: 'btn btn-default'
       = link_to 'Remove', namespace_project_hook_path(@project.namespace, @project, @hook), method: :delete, class: 'btn btn-remove pull-right', data: { confirm: 'Are you sure?' }
 
@@ -22,4 +20,3 @@
 
 = render partial: 'projects/hook_logs/index', locals: { hook: @hook, hook_logs: @hook_logs, project: @project }
 
->>>>>>> ce-com/master