From 400c9c5ae2c04340dc5a3490b27b393c410f63ad Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 15 Apr 2015 12:12:58 +0300
Subject: Revert "Removed help link from sidebar"

This reverts commit 6fe26e3e468ae0b79e2e05b4d4dd608cd9bbcd94.
---
 app/views/layouts/nav/_dashboard.html.haml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 511c0694b8a..e4f630c6a18 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/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
-- 
cgit v1.2.1


From 5d1ab47bd2dc80e8c5237416405009786ef58629 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 15 Apr 2015 12:13:49 +0300
Subject: Revert help link tests removal

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 features/dashboard/active_tab.feature  | 5 +++++
 features/steps/dashboard/active_tab.rb | 3 +++
 features/steps/shared/paths.rb         | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/features/dashboard/active_tab.feature b/features/dashboard/active_tab.feature
index c17dfd07063..08b87808f33 100644
--- a/features/dashboard/active_tab.feature
+++ b/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
diff --git a/features/steps/dashboard/active_tab.rb b/features/steps/dashboard/active_tab.rb
index 19ff77b9fe6..0e2c04fb299 100644
--- a/features/steps/dashboard/active_tab.rb
+++ b/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
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index 8ce17b94142..e3cf1b92cda 100644
--- a/features/steps/shared/paths.rb
+++ b/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
-- 
cgit v1.2.1