Merge branch 'revert-help-link' into 'master'

Revert help link

Revert for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/483

cc @douwe

See merge request !1776

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

@@ -31,3 +31,8 @@
       %span
         Merge Requests
         %span.count= current_user.assigned_merge_requests.opened.count
+  = nav_link(controller: :help) do
+    = link_to help_path, title: 'Help' do
+      %i.fa.fa-question-circle
+      %span
+        Help

features/dashboard/active_tab.feature

@@ -17,3 +17,8 @@ Feature: Dashboard Active Tab
     Given I visit dashboard merge requests page
     Then the active main tab should be Merge Requests
     And no other main tabs should be active
+
+  Scenario: On Dashboard Help
+    Given I visit dashboard help page
+    Then the active main tab should be Help
+    And no other main tabs should be active

features/steps/dashboard/active_tab.rb

@@ -3,4 +3,7 @@ class Spinach::Features::DashboardActiveTab < Spinach::FeatureSteps
   include SharedPaths
   include SharedActiveTab
 
+  step 'the active main tab should be Help' do
+    ensure_active_main_tab('Help')
+  end
 end

features/steps/shared/paths.rb

@@ -83,6 +83,10 @@ module SharedPaths
     visit search_path
   end
 
+  step 'I visit dashboard help page' do
+    visit help_path
+  end
+
   step 'I visit dashboard groups page' do
     visit dashboard_groups_path
   end