Valery Sizov · 937fe659 · 937fe659
--- a/spec/features/global_search_spec.rb
+++ b/spec/features/global_search_spec.rb
 require 'spec_helper'

-<<<<<<< HEAD
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
  resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create]
  resources :labels, except: [:show], constraints: { id: /\d+/ }
->>>>>>> ce/master
+
+  ## EE-specific
+  resource :notification_setting, only: [:update]
+  resources :audit_events, only: [:index]
+  ## EE-specific
+end
+
+## EE-specific
+resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ }, module: :groups do
+  member do
+    get :test
+  end
 end