diff options
| author | Onuwa Nnachi Isaac <matrix4u2002@gmail.com> | 2018-02-12 14:14:54 +0100 |
|---|---|---|
| committer | Onuwa Nnachi Isaac <matrix4u2002@gmail.com> | 2018-02-12 14:14:54 +0100 |
| commit | 7691c1d9dcbc080e7ec58dcb6f4a8f1767509e7e (patch) | |
| tree | 31364bd280e5c9f860229b90587bc7c3ff1dc5f4 | |
| parent | f7401f70734446d082ba815477ae11a31fe7524b (diff) | |
| download | gitlab-ce-7691c1d9dcbc080e7ec58dcb6f4a8f1767509e7e.tar.gz | |
Revert and remove header_title line from labels issue
| -rw-r--r-- | app/helpers/groups_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/groups/labels/new.html.haml | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/group-label-page-breadcrumb.yml | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index d248c556234..23de3590b93 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -39,7 +39,7 @@ module GroupsHelper full_title += render "layouts/nav/breadcrumbs/collapsed_dropdown", location: :before, title: _("Show parent subgroups") full_title += breadcrumb_list_item group_title_link(group) - full_title += ''.html_safe + link_to(simple_sanitize(name), url, class: 'group-path breadcrumb-item-text js-breadcrumb-item-text') if name + full_title += ' · '.html_safe + link_to(simple_sanitize(name), url, class: 'group-path breadcrumb-item-text js-breadcrumb-item-text') if name full_title.html_safe end diff --git a/app/views/groups/labels/new.html.haml b/app/views/groups/labels/new.html.haml index 934ebe11c73..538c353cf2d 100644 --- a/app/views/groups/labels/new.html.haml +++ b/app/views/groups/labels/new.html.haml @@ -1,6 +1,5 @@ - breadcrumb_title "Labels" - page_title 'New Label' -- header_title group_title(@group, '', group_labels_path(@group)) %h3.page-title New Label diff --git a/changelogs/unreleased/group-label-page-breadcrumb.yml b/changelogs/unreleased/group-label-page-breadcrumb.yml new file mode 100644 index 00000000000..c6cc4618c52 --- /dev/null +++ b/changelogs/unreleased/group-label-page-breadcrumb.yml @@ -0,0 +1,5 @@ +--- +title: Fix breadcrumb on labels page for groups +merge_request: 17045 +author: Onuwa Nnachi Isaac +type: fixed |