CE upstream

CE changes https://gitlab.com/gitlab-org/gitlab-ce/compare/d636efbe26ee51030bb108d889c2ef867570358a...0c36b810abede73b3cf59f951e7467dbac54ec98?expand_all_diffs=1

config/routes/group.rb

@@ -47,15 +47,15 @@
   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
+  ## EE-specific
+  resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ } do
+    member do
+      get :test
+    end
   end
+  ## EE-specific
 end
-## EE-specific
 # Must be last route in this file
 get 'groups/:id' => 'groups#show', as: :group_canonical