summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2016-09-02 10:57:22 -0500
committerMike Greiling <mike@pixelcog.com>2016-09-07 14:02:21 -0500
commit32c53d6d1b71885acbcab7829e197744a357c9fc (patch)
treefd84cdc3b4ed340aba01282d047a71352640e016 /app
parenta510fe11026ddfd264b9cc4627541b6dac0c38c7 (diff)
downloadgitlab-ce-32c53d6d1b71885acbcab7829e197744a357c9fc.tar.gz
remove dead code - 'collapsed_nav' cookie no longer used since a1fbdbb6 (see MR !4579)
Diffstat (limited to 'app')
-rw-r--r--app/helpers/nav_helper.rb13
-rw-r--r--app/views/layouts/_page.html.haml2
2 files changed, 1 insertions, 14 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index 99e39eb442a..df87fac132d 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -1,16 +1,4 @@
module NavHelper
- def nav_menu_collapsed?
- cookies[:collapsed_nav] == 'true'
- end
-
- def nav_sidebar_class
- if nav_menu_collapsed?
- "sidebar-collapsed"
- else
- "sidebar-expanded"
- end
- end
-
def page_sidebar_class
if pinned_nav?
"page-sidebar-expanded page-sidebar-pinned"
@@ -24,7 +12,6 @@ module NavHelper
current_path?('merge_requests#builds') ||
current_path?('merge_requests#conflicts') ||
current_path?('merge_requests#pipelines') ||
-
current_path?('issues#show')
if cookies[:collapsed_gutter] == 'true'
"page-gutter right-sidebar-collapsed"
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index bf50633af24..4f7839a881f 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -1,5 +1,5 @@
.page-with-sidebar{ class: "#{page_sidebar_class} #{page_gutter_class}" }
- .sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
+ .sidebar-wrapper.nicescroll
.sidebar-action-buttons
= link_to '#', class: 'nav-header-btn toggle-nav-collapse', title: "Open/Close" do
%span.sr-only Toggle navigation