Merge branch 'menu_bar_consistency' into 'master'

Webhook name consistency

In project settings we name it "Webhooks" in group settings "Web Hook".
This request makes it consistent.

See merge request !352

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

@@ -25,10 +25,10 @@
           %span
             LDAP Groups
     = nav_link(controller: :hooks) do
-      = link_to group_hooks_path(@group), title: "Web Hooks" do
+      = link_to group_hooks_path(@group), title: "Webhooks" do
         %i.fa.fa-link
         %span
-          Web Hooks
+          Webhooks
     = nav_link(controller: :audit_events) do
       = link_to group_audit_events_path(@group), title: "Audit Events" do
         %i.fa.fa-file-text-o

doc/web_hooks/web_hooks.md

@@ -14,7 +14,7 @@ Webhooks can be used to update an external issue tracker, trigger CI builds, upd
 
 In GitLab Enterprise Edition you can configure web hooks globally for the whole
 group. You can add the group level web hooks on the group settings page
-**Settings > Web Hooks**.
+**Settings > Webhooks**.
 
 ## SSL Verification
 

features/group_active_tab.feature

@@ -10,9 +10,9 @@ Feature: Group Active Tab
     And no other sub navs should be active
     And the active main tab should be Settings
 
-  Scenario: On Web Hooks
-    When I go to "Web Hooks"
-    Then the active sub nav should be Web Hooks
+  Scenario: On Webhooks
+    When I go to "Webhooks"
+    Then the active sub nav should be Webhooks
     And no other sub navs should be active
     And the active main tab should be Settings
 

features/steps/group_active_tab.rb

@@ -15,15 +15,15 @@ class Spinach::Features::GroupActiveTab < Spinach::FeatureSteps
     end
   end
 
-  step 'the active sub nav should be Web Hooks' do
-    ensure_active_sub_nav('Web Hooks')
+  step 'the active sub nav should be Webhooks' do
+    ensure_active_sub_nav('Webhooks')
   end
 
   step 'I go to "Audit Events"' do
     click_link 'Audit Events'
   end
 
-  step 'I go to "Web Hooks"' do
-    click_link 'Web Hooks'
+  step 'I go to "Webhooks"' do
+    click_link 'Webhooks'
   end
 end