Moved the webhooks and services gear options to a single one called integrations

app/controllers/projects/hooks_controller.rb

@@ -7,8 +7,7 @@ class Projects::HooksController < Projects::ApplicationController
   layout "project_settings"
 
   def index
-    @hooks = @project.hooks
-    @hook = ProjectHook.new
+    redirect_to namespace_project_settings_integrations_path(@project.namespace, @project)
   end
 
   def create
@@ -16,7 +15,7 @@ class Projects::HooksController < Projects::ApplicationController
     @hook.save
 
     if @hook.valid?
-      redirect_to namespace_project_hooks_path(@project.namespace, @project)
+      redirect_to namespace_project_settings_integrations_path(@project.namespace, @project)
     else
       @hooks = @project.hooks.select(&:persisted?)
       render :index
@@ -44,7 +43,7 @@ class Projects::HooksController < Projects::ApplicationController
   def destroy
     hook.destroy
 
-    redirect_to namespace_project_hooks_path(@project.namespace, @project)
+    redirect_to namespace_project_settings_integrations_path(@project.namespace, @project)
   end
 
   private

app/controllers/projects/services_controller.rb

@@ -10,7 +10,7 @@ class Projects::ServicesController < Projects::ApplicationController
   layout "project_settings"
 
   def index
-    @services = @project.find_or_initialize_services
+    redirect_to namespace_project_settings_integrations_path(@project.namespace, @project)
   end
 
   def edit

app/controllers/projects/settings/integrations_controller.rb

@@ -0,0 +1,18 @@
+module Projects
+  module Settings
+    class IntegrationsController < Projects::ApplicationController
+      include ServiceParams
+
+      before_action :authorize_admin_project!
+
+      layout "project_settings"
+      def show
+        @hooks = @project.hooks
+        @hook = ProjectHook.new
+
+        # Services
+        @services = @project.find_or_initialize_services
+      end
+    end
+  end
+end

app/helpers/gitlab_routing_helper.rb

@@ -208,6 +208,9 @@ module GitlabRoutingHelper
   end
 
   # Settings
+  def project_settings_integrations_path(project, *args)
+    namespace_project_settings_integrations_path(project.namespace, project, *args)
+  end
   def project_settings_members_path(project, *args)
     namespace_project_settings_members_path(project.namespace, project, *args)
   end

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

@@ -8,14 +8,10 @@
     = link_to namespace_project_deploy_keys_path(@project.namespace, @project), title: 'Deploy Keys' do
       %span
         Deploy Keys
-  = nav_link(controller: :hooks) do
-    = link_to namespace_project_hooks_path(@project.namespace, @project), title: 'Webhooks' do
+  = nav_link(controller: :integrations) do
+    = link_to namespace_project_settings_integrations_path(@project.namespace, @project), title: 'Webhooks' do
       %span
-        Webhooks
-  = nav_link(controller: :services) do
-    = link_to namespace_project_services_path(@project.namespace, @project), title: 'Services' do
-      %span
-        Services
+        Integrations
   = nav_link(controller: :protected_branches) do
     = link_to namespace_project_protected_branches_path(@project.namespace, @project), title: 'Protected Branches' do
       %span

app/views/projects/services/_index.html.haml

@@ -1,5 +1,3 @@
-- page_title "Services"
-
 .row.prepend-top-default.append-bottom-default
   .col-lg-3
     %h4.prepend-top-0

app/views/projects/settings/integrations/show.html.haml

@@ -0,0 +1,3 @@
+- page_title 'Integrations'
+= render 'projects/hooks/index'
+= render 'projects/services/index'

config/routes/project.rb

@@ -307,9 +307,9 @@ constraints(ProjectUrlConstrainer.new) do
           end
         end
       end
-
       namespace :settings do
         resource :members, only: [:show]
+        resource :integrations, only: [:show]
       end
 
       # Since both wiki and repository routing contains wildcard characters