summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-04-26 12:09:18 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-04-26 12:09:18 +0000
commit9edf852c3a851d84b85bc94f7a3b41d5ef04dd32 (patch)
treef79a739a455d5d02758e225582688c0451465aa6 /app/views/projects
parent6f22c85c38b7a896178879172f4c0f82353308f8 (diff)
downloadgitlab-ce-9edf852c3a851d84b85bc94f7a3b41d5ef04dd32.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/runners/edit.html.haml5
-rw-r--r--app/views/projects/runners/register.html.haml3
-rw-r--r--app/views/projects/runners/show.html.haml3
3 files changed, 7 insertions, 4 deletions
diff --git a/app/views/projects/runners/edit.html.haml b/app/views/projects/runners/edit.html.haml
index 50c46402b53..58955663bfa 100644
--- a/app/views/projects/runners/edit.html.haml
+++ b/app/views/projects/runners/edit.html.haml
@@ -1,7 +1,8 @@
+- runner_name = runner_short_name(@runner)
- breadcrumb_title _('Edit')
-- page_title _('Edit'), "##{@runner.id} (#{@runner.short_sha})"
+- page_title _('Edit'), runner_name
- add_to_breadcrumbs _('CI/CD Settings'), project_settings_ci_cd_path(@project)
-- add_to_breadcrumbs "#{@runner.short_sha}", project_runner_path(@project, @runner)
+- add_to_breadcrumbs runner_name, project_runner_path(@project, @runner)
%h1.page-title.gl-font-size-h-display
= s_('Runners|Runner #%{runner_id}') % { runner_id: @runner.id }
diff --git a/app/views/projects/runners/register.html.haml b/app/views/projects/runners/register.html.haml
index 561a919323d..a8ce08f051f 100644
--- a/app/views/projects/runners/register.html.haml
+++ b/app/views/projects/runners/register.html.haml
@@ -1,5 +1,4 @@
-- runner_name = "##{@runner.id} (#{@runner.short_sha})"
-
+- runner_name = runner_short_name(@runner)
- add_to_breadcrumbs _('CI/CD Settings'), project_settings_ci_cd_path(@project)
- breadcrumb_title s_('Runners|Register runner')
- page_title s_('Runners|Register'), runner_name
diff --git a/app/views/projects/runners/show.html.haml b/app/views/projects/runners/show.html.haml
index cb7984729c8..60f403b1015 100644
--- a/app/views/projects/runners/show.html.haml
+++ b/app/views/projects/runners/show.html.haml
@@ -1,3 +1,6 @@
+- runner_name = runner_short_name(@runner)
+- breadcrumb_title runner_name
+- page_title runner_name
- add_to_breadcrumbs _('CI/CD Settings'), project_settings_ci_cd_path(@project)
= render 'shared/runners/runner_details', runner: @runner