diff options
author | Phil Hughes <me@iamphill.com> | 2017-10-24 08:33:16 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-10-24 08:33:16 +0000 |
commit | 7444e8a1342e0b3e361b6973754eb3da20130e49 (patch) | |
tree | 3f623fd2a5a4bb0a0505900b57008911eac6d176 /app/helpers | |
parent | a811704c115118fff76046c9307224d41901185a (diff) | |
parent | 58af2647dc6a5bd7805e703a32fe45190d62c7d3 (diff) | |
download | gitlab-ce-7444e8a1342e0b3e361b6973754eb3da20130e49.tar.gz |
Merge branch 'remove-new-sidebar-stuff' into 'master'
Clean up `new-sidebar`
See merge request gitlab-org/gitlab-ce!14978
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/nav_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index a23a43c9f43..5a74511afa7 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -1,7 +1,7 @@ module NavHelper def page_with_sidebar_class class_name = page_gutter_class - class_name << 'page-with-new-sidebar' if defined?(@left_sidebar) && @left_sidebar + class_name << 'page-with-contextual-sidebar' if defined?(@left_sidebar) && @left_sidebar class_name << 'page-with-icon-sidebar' if collapsed_sidebar? && @left_sidebar class_name |