Fix conflicts introduced by e0ab5618

app/models/hooks/group_hook.rb

@@ -4,4 +4,7 @@ class GroupHook < ProjectHook
   self.singular_route_key = :hook
 
   belongs_to :group
+
+  clear_validators!
+  validates :url, presence: true, url: true
 end

app/models/hooks/project_hook.rb

 class ProjectHook < WebHook
-<<<<<<< HEAD
   include CustomModelNaming
 
   self.singular_route_key = :hook
 
-  belongs_to :project
-=======
   TRIGGERS = {
     push_hooks:               :push_events,
     tag_push_hooks:           :tag_push_events,
@@ -21,7 +18,6 @@ class ProjectHook < WebHook
   TRIGGERS.each do |trigger, event|
     scope trigger, -> { where(event => true) }
   end
->>>>>>> ce/master
 
   belongs_to :project
   validates :project, presence: true

app/services/wiki_pages/base_service.rb

 module WikiPages
   class BaseService < ::BaseService
-<<<<<<< HEAD
     prepend EE::WikiPages::BaseService
 
-    def hook_data(page, action)
-      hook_data = {
-        object_kind: page.class.name.underscore,
-        user: current_user.hook_attrs,
-        project: @project.hook_attrs,
-        wiki: @project.wiki.hook_attrs,
-        object_attributes: page.hook_attrs
-      }
-
-      page_url = Gitlab::UrlBuilder.build(page)
-      hook_data[:object_attributes].merge!(url: page_url, action: action)
-      hook_data
-    end
-
-=======
->>>>>>> ce/master
     private
 
     def execute_hooks(page, action = 'create')