diff options
Diffstat (limited to 'app/views/projects/merge_requests/conflicts/show.html.haml')
-rw-r--r-- | app/views/projects/merge_requests/conflicts/show.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/conflicts/show.html.haml b/app/views/projects/merge_requests/conflicts/show.html.haml index a882196ffa2..3facca4d4f7 100644 --- a/app/views/projects/merge_requests/conflicts/show.html.haml +++ b/app/views/projects/merge_requests/conflicts/show.html.haml @@ -1,3 +1,6 @@ +- add_to_breadcrumbs _("Merge requests"), project_merge_requests_path(@project) +- add_to_breadcrumbs @merge_request.to_reference, project_merge_request_path(@project, @merge_request) +- breadcrumb_title _("Merge conflicts") - page_title _("Merge Conflicts"), "#{@merge_request.title} (#{@merge_request.to_reference}", _("Merge requests") - add_page_specific_style 'page_bundles/merge_conflicts' |