summaryrefslogtreecommitdiff
path: root/app/helpers/page_layout_helper.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-07-24 14:36:31 +0100
committerPhil Hughes <me@iamphill.com>2017-07-24 14:36:31 +0100
commit4d2be5bbec25d60a8d478bda5bc83159f2c845b1 (patch)
treec3c28a833ccd2a6628d928acee44e62ccfcc6fd8 /app/helpers/page_layout_helper.rb
parent1a2d180e3dfd8bdad94766a2e8b1195288c2b146 (diff)
parentd4c4dec80dc3abd39116440a3c291c19b27258e1 (diff)
downloadgitlab-ce-4d2be5bbec25d60a8d478bda5bc83159f2c845b1.tar.gz
Merge branch 'master' into sidebar-fly-out-sub-nav
Diffstat (limited to 'app/helpers/page_layout_helper.rb')
-rw-r--r--app/helpers/page_layout_helper.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index 3286a92a8a7..b30b2eb1d03 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -4,6 +4,10 @@ module PageLayoutHelper
@page_title.push(*titles.compact) if titles.any?
+ if show_new_nav? && titles.any? && !defined?(@breadcrumb_title)
+ @breadcrumb_title = @page_title.last
+ end
+
# Segments are seperated by middot
@page_title.join(" \u00b7 ")
end