diff --git a/app/views/admin/services/edit.html.haml b/app/views/admin/services/edit.html.haml
index 53d970e33c1..0a641c3f7a6 100644
--- a/app/views/admin/services/edit.html.haml
+++ b/app/views/admin/services/edit.html.haml
@@ -1,2 +1,3 @@
+- @breadcrumb_title = "Service Templates"
- page_title @service.title, "Service Templates"
= render 'form'
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index 52e0012fd7d..d2fb4ab101e 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -1,3 +1,4 @@
+- @breadcrumb_title = "Issues"
- @hide_top_links = true
- page_title "Issues"
- header_title "Issues", issues_dashboard_path(assignee_id: current_user.id)
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index c3fe14da2b2..df2470a0118 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -1,3 +1,4 @@
+- @breadcrumb_title = "Merge Requests"
- @hide_top_links = true
- page_title "Merge Requests"
- header_title "Merge Requests", merge_requests_dashboard_path(assignee_id: current_user.id)
diff --git a/app/views/explore/snippets/index.html.haml b/app/views/explore/snippets/index.html.haml
index e5706d04736..94fc4ac21d2 100644
--- a/app/views/explore/snippets/index.html.haml
+++ b/app/views/explore/snippets/index.html.haml
@@ -1,3 +1,4 @@
+- @hide_top_links = true
- page_title "Snippets"
- header_title "Snippets", snippets_path
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index dc7bd183432..10eb8ce6cc7 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -1,3 +1,4 @@
+- @breadcrumb_link = dashboard_groups_path
- @hide_top_links = true
- page_title 'New Group'
- header_title "Groups", dashboard_groups_path
diff --git a/app/views/layouts/nav/_new_admin_sidebar.html.haml b/app/views/layouts/nav/_new_admin_sidebar.html.haml
index 40c1ca7b53e..4a1d27047ac 100644
--- a/app/views/layouts/nav/_new_admin_sidebar.html.haml
+++ b/app/views/layouts/nav/_new_admin_sidebar.html.haml
@@ -13,7 +13,7 @@
= nav_link(controller: :dashboard, html_options: {class: 'home'}) do
= link_to admin_root_path, title: 'Overview' do
%span
- Overview
+ Dashboard
= nav_link(controller: [:admin, :projects]) do
= link_to admin_projects_path, title: 'Projects' do
%span
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml
index ed079ed7dfb..c5917ae5aeb 100644
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@@ -1,3 +1,4 @@
+- @breadcrumb_title = "Account"
- page_title "Account"
- @content_class = "limit-container-width" unless fluid_layout
= render 'profiles/head'
diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml
index 35a547c2e3f..e759d0d0a4a 100644
--- a/app/views/profiles/two_factor_auths/show.html.haml
+++ b/app/views/profiles/two_factor_auths/show.html.haml
@@ -1,12 +1,11 @@
- page_title 'Two-Factor Authentication', 'Account'
-- header_title "Two-Factor Authentication", profile_two_factor_auth_path
+- if show_new_nav?
+ - breadcrumbs_extra_links("Account", profile_path)
+- else
+ - header_title "Two-Factor Authentication", profile_two_factor_auth_path
- @breadcrumb_title = "Two-Factor Authentication"
- @content_class = "limit-container-width" unless fluid_layout
-- if show_new_nav?
- - content_for :header_title_before do
- = link_to "User Settings", profile_path
-
= render 'profiles/head'
- if inject_u2f_api?
diff --git a/app/views/projects/boards/_show.html.haml b/app/views/projects/boards/_show.html.haml
index 364c4c0e473..cb916059afb 100644
--- a/app/views/projects/boards/_show.html.haml
+++ b/app/views/projects/boards/_show.html.haml
@@ -4,7 +4,7 @@
- page_title "Boards"
- if show_new_nav?
- - breadcrumbs_extra_links("Issues", project_issues_path(@project.namespace))
+ - breadcrumbs_extra_links("Issues", project_issues_path(@project))
- content_for :page_specific_javascripts do
= webpack_bundle_tag 'common_vue'
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml
index 4f70a57243b..01442dc517e 100644
--- a/app/views/projects/branches/index.html.haml
+++ b/app/views/projects/branches/index.html.haml
@@ -3,7 +3,7 @@
= render "projects/commits/head"
- if show_new_nav?
- - breadcrumbs_extra_links("Repository", project_files_path(@project))
+ - breadcrumbs_extra_links("Repository", project_tree_path(@project))
%div{ class: container_class }
.top-area.adjust
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index edebd08dbb5..a949ceefd6e 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -5,7 +5,7 @@
= auto_discovery_link_tag(:atom, project_commits_url(@project, @ref, rss_url_options), title: "#{@project.name}:#{@ref} commits")
- if show_new_nav?
- - breadcrumbs_extra_links("Repository", project_files_path(@project))
+ - breadcrumbs_extra_links("Repository", project_tree_path(@project))
= content_for :sub_nav do
= render "head"
diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml
index d71bc88298b..b245a91dc33 100644
--- a/app/views/projects/compare/index.html.haml
+++ b/app/views/projects/compare/index.html.haml
@@ -1,7 +1,7 @@
- @no_container = true
- page_title "Compare"
- if show_new_nav?
- - breadcrumbs_extra_links("Repository", project_files_path(@project))
+ - breadcrumbs_extra_links("Repository", project_tree_path(@project))
= render "projects/commits/head"
%div{ class: container_class }
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index db722554f1a..e23fa6068a6 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -1,7 +1,7 @@
- @no_container = true
- page_title "#{params[:from]}...#{params[:to]}"
- if show_new_nav?
- - breadcrumbs_extra_links("Repository", project_files_path(@project))
+ - breadcrumbs_extra_links("Repository", project_tree_path(@project))
= render "projects/commits/head"
%div{ class: container_class }
diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml
index 30cdbc5ae04..595c444f7ea 100644
--- a/app/views/projects/environments/index.html.haml
+++ b/app/views/projects/environments/index.html.haml
@@ -2,6 +2,9 @@
- page_title "Environments"
= render "projects/pipelines/head"
+- if show_new_nav?
+ - breadcrumbs_extra_links("Pipelines", project_pipelines_path(@project))
+
- content_for :page_specific_javascripts do
= page_specific_javascript_bundle_tag('common_vue')
= page_specific_javascript_bundle_tag("environments")
diff --git a/app/views/projects/graphs/charts.html.haml b/app/views/projects/graphs/charts.html.haml
index f873f629937..9f21655a11e 100644
--- a/app/views/projects/graphs/charts.html.haml
+++ b/app/views/projects/graphs/charts.html.haml
@@ -2,7 +2,7 @@
- @breadcrumb_title = "Charts"
- page_title "Charts"
- if show_new_nav?
- - breadcrumbs_extra_links("Repository", project_files_path(@project))
+ - breadcrumbs_extra_links("Repository", project_tree_path(@project))
- content_for :page_specific_javascripts do
= page_specific_javascript_bundle_tag('common_d3')
= page_specific_javascript_bundle_tag('graphs')
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index 1b4b12ba517..13161d6da22 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -6,7 +6,7 @@
= page_specific_javascript_bundle_tag('graphs')
- if show_new_nav?
- - breadcrumbs_extra_links("Repository", project_files_path(@project))
+ - breadcrumbs_extra_links("Repository", project_tree_path(@project))
= render 'projects/commits/head'
diff --git a/app/views/projects/jobs/index.html.haml b/app/views/projects/jobs/index.html.haml
index 8604c7d3ea4..f4fe56036b1 100644
--- a/app/views/projects/jobs/index.html.haml
+++ b/app/views/projects/jobs/index.html.haml
@@ -2,6 +2,9 @@
- page_title "Jobs"
= render "projects/pipelines/head"
+- if show_new_nav?
+ - breadcrumbs_extra_links("Pipelines", project_pipelines_path(@project))
+
%div{ class: container_class }
.top-area
- build_path_proc = ->(scope) { project_jobs_path(@project, scope: scope) }
diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml
index 1125207ef73..1cb9ce25d2e 100644
--- a/app/views/projects/network/show.html.haml
+++ b/app/views/projects/network/show.html.haml
@@ -3,7 +3,7 @@
- content_for :page_specific_javascripts do
= page_specific_javascript_bundle_tag('network')
- if show_new_nav?
- - breadcrumbs_extra_links("Repository", project_files_path(@project))
+ - breadcrumbs_extra_links("Repository", project_tree_path(@project))
= render "projects/commits/head"
= render "head"
%div{ class: container_class }
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index f025a7a55a5..e2cda1a6c01 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -1,3 +1,4 @@
+- @breadcrumb_link = dashboard_projects_path
- @hide_top_links = true
- page_title 'New Project'
- header_title "Projects", dashboard_projects_path
diff --git a/app/views/projects/services/edit.html.haml b/app/views/projects/services/edit.html.haml
index 0f1a76a104a..4179d2dc8a4 100644
--- a/app/views/projects/services/edit.html.haml
+++ b/app/views/projects/services/edit.html.haml
@@ -1,3 +1,8 @@
+- @breadcrumb_title = "Integrations"
- page_title @service.title, "Services"
+
+- if show_new_nav?
+ - breadcrumbs_extra_links("Settings", edit_project_path(@project))
+
= render "projects/settings/head"
= render 'form'
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index 7fafbe1c432..805cc960c54 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -4,7 +4,7 @@
= render "projects/commits/head"
- if show_new_nav?
- - breadcrumbs_extra_links("Repository", project_files_path(@project))
+ - breadcrumbs_extra_links("Repository", project_tree_path(@project))
.flex-list{ class: container_class }
.top-area.adjust
diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml
index 3f3fa67f390..ad389e17221 100644
--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
@@ -1,5 +1,5 @@
- @no_container = true
-- @breadcrumb_title = _("Files")
+- @breadcrumb_title = _("Repository")
- page_title @path.presence || _("Files"), @ref
= content_for :meta_tags do
diff --git a/app/views/snippets/new.html.haml b/app/views/snippets/new.html.haml
index ca8afb4bb6a..513e26e1d81 100644
--- a/app/views/snippets/new.html.haml
+++ b/app/views/snippets/new.html.haml
@@ -1,3 +1,4 @@
+- @hide_top_links = true
- page_title "New Snippet"
%h3.page-title
New Snippet
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index 8818590362d..706f13dd004 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -1,3 +1,4 @@
+- @hide_top_links = true
- @content_class = "limit-container-width limited-inner-width-container" unless fluid_layout
- page_title "#{@snippet.title} (#{@snippet.to_reference})", "Snippets"