diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-04-06 11:52:39 +0200 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2018-04-06 11:52:39 +0200 |
| commit | 9296d47352df0e7afdd5c5abce6e82476049bef4 (patch) | |
| tree | 452c21c508501f7947dd386be49a82f5836b8f33 | |
| parent | 02968711128d4bd8939467181504cbe314274cc2 (diff) | |
| download | gitlab-ce-9296d47352df0e7afdd5c5abce6e82476049bef4.tar.gz | |
Fix breadcrumb links
| -rw-r--r-- | app/views/dashboard/issues.html.haml | 4 | ||||
| -rw-r--r-- | app/views/dashboard/merge_requests.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/issuable/_filter.html.haml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index 35bf92a0d07..bb472b4c900 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -1,6 +1,6 @@ - @hide_top_links = true -- page_title "Issues" -- header_title "Issues", issues_dashboard_path(assignee_id: current_user.id) +- page_title _("Issues") +- @breadcrumb_link = issues_dashboard_path(assignee_id: current_user.id) = content_for :meta_tags do = auto_discovery_link_tag(:atom, params.merge(rss_url_options), title: "#{current_user.name} issues") diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index 7b69a6f5d0f..61aae31be60 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -1,6 +1,6 @@ - @hide_top_links = true -- page_title "Merge Requests" -- header_title "Merge Requests", merge_requests_dashboard_path(assignee_id: current_user.id) +- page_title _("Merge Requests") +- @breadcrumb_link = merge_requests_dashboard_path(assignee_id: current_user.id) .top-area = render 'shared/issuable/nav', type: :merge_requests, display_count: !@no_filters_set diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml index 994198e2f69..1bd5b4164b1 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -24,7 +24,7 @@ .filter-item.inline.labels-filter = render "shared/issuable/label_dropdown", selected: selected_labels, use_id: false, selected_toggle: params[:label_name], data_options: { field_name: "label_name[]" } - - if !@no_filters_set + - unless @no_filters_set .pull-right = render 'shared/sort_dropdown' |