Merge branch 'top-menu-improvements' into 'master'

Navigation improvements

- [x] make explore area as part of dashboard
- [x] move navigation links from top right corner to sidebar
- [x] group navigation items on dashboard
- [x] cleanup UI after such changes
- [ ] fix tests

cc @sytses @JobV

See merge request !1177

2 files changed, 9 insertions, 1 deletions

diff --git a/app/helpers/explore_helper.rb b/app/helpers/explore_helper.rb
index 7616fe6bad8..0d291f9a87e 100644
--- a/app/helpers/explore_helper.rb
+++ b/app/helpers/explore_helper.rb
@@ -10,7 +10,7 @@ module ExploreHelper
 
     options = exist_opts.merge(options)
 
-    path = request.path
+    path = explore_projects_path
     path << "?#{options.to_param}"
     path
   end
diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb
index 77727337f07..0e7d8065ac7 100644
--- a/app/helpers/tab_helper.rb
+++ b/app/helpers/tab_helper.rb
@@ -67,6 +67,14 @@ module TabHelper
       path.any? do |single_path|
         current_path?(single_path)
       end
+    elsif page = options.delete(:page)
+      unless page.respond_to?(:each)
+        page = [page]
+      end
+
+      page.any? do |single_page|
+        current_page?(single_page)
+      end
     else
       c = options.delete(:controller)
       a = options.delete(:action)