diff options
author | Eric Eastwood <contact@ericeastwood.com> | 2018-03-27 12:39:18 -0500 |
---|---|---|
committer | Eric Eastwood <contact@ericeastwood.com> | 2018-03-27 12:39:18 -0500 |
commit | de0c4730bb83b94195678e5ad4865ea648e6585f (patch) | |
tree | 3ea0fd48c5736b0f5b328f117c3db0508a371d22 /app/helpers/page_layout_helper.rb | |
parent | dc5b5130d573a48fc34fa62862a1ad6da776b0d0 (diff) | |
parent | a1cde68d208437a470267e28ccff66fe8be88c2e (diff) | |
download | gitlab-ce-de0c4730bb83b94195678e5ad4865ea648e6585f.tar.gz |
Merge branch 'master' into add-canary-favicon
Diffstat (limited to 'app/helpers/page_layout_helper.rb')
-rw-r--r-- | app/helpers/page_layout_helper.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb index 7279d5fb2d4..bb782060e9b 100644 --- a/app/helpers/page_layout_helper.rb +++ b/app/helpers/page_layout_helper.rb @@ -4,8 +4,12 @@ module PageLayoutHelper @page_title.push(*titles.compact) if titles.any? + if titles.any? && !defined?(@breadcrumb_title) + @breadcrumb_title = @page_title.last + end + # Segments are seperated by middot - @page_title.join(" \u00b7 ") + @page_title.join(" ยท ") end # Define or get a description for the current page @@ -78,7 +82,9 @@ module PageLayoutHelper @header_title = title @header_title_url = title_url else - @header_title_url ? link_to(@header_title, @header_title_url) : @header_title + return @header_title unless @header_title_url + + breadcrumb_list_item(link_to(@header_title, @header_title_url)) end end |