diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-29 11:46:05 +0300 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-29 11:46:05 +0300 |
| commit | 0addef2e574a69c7dbb28179bf74672e98884806 (patch) | |
| tree | 2c98d8b4d58cb0e94424e9d19ad414bd8380cdc1 /app | |
| parent | a481337b6a1b30750a16fffe0e83521b7909b851 (diff) | |
| parent | d0737b18856170d054c9235cd285d3eb5e45056b (diff) | |
Merge branch 'breadcrumb-item-links' into 'master'
Fixed breadcrumb title not linking
Closes #38059
See merge request gitlab-org/gitlab-ce!14532
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/breadcrumbs_helper.rb | 6 | ||||
| -rw-r--r-- | app/views/layouts/nav/_breadcrumbs.html.haml | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/app/helpers/breadcrumbs_helper.rb b/app/helpers/breadcrumbs_helper.rb index ee1b7ed083e..87d2a47f6cb 100644 --- a/app/helpers/breadcrumbs_helper.rb +++ b/app/helpers/breadcrumbs_helper.rb @@ -10,11 +10,7 @@ module BreadcrumbsHelper def breadcrumb_title_link return @breadcrumb_link if @breadcrumb_link - if controller.available_action?(:index) - url_for(action: "index") - else - request.path - end + request.path end def breadcrumb_title(title) diff --git a/app/views/layouts/nav/_breadcrumbs.html.haml b/app/views/layouts/nav/_breadcrumbs.html.haml index 7bd3f5306a2..002922e13f1 100644 --- a/app/views/layouts/nav/_breadcrumbs.html.haml +++ b/app/views/layouts/nav/_breadcrumbs.html.haml @@ -16,5 +16,5 @@ = breadcrumb_list_item link_to(extra[:text], extra[:link]) = render "layouts/nav/breadcrumbs/collapsed_dropdown", location: :after %li - %h2.breadcrumbs-sub-title= @breadcrumb_title + %h2.breadcrumbs-sub-title= link_to @breadcrumb_title, breadcrumb_title_link = yield :header_content |