Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-09-02 21:09:42 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-09-02 21:09:42 +0300
commita37d7647a5aa97b46d616ab3d30ed693e5e8bdff (patch)
tree91854088bba2baa00846508b75bf02fb3acd1c3a /app/views
parent0a70b104d06b27e1d391a7035fa0500e84daaef4 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
-rw-r--r--app/views/groups/runners/edit.html.haml20
1 files changed, 11 insertions, 9 deletions
diff --git a/app/views/groups/runners/edit.html.haml b/app/views/groups/runners/edit.html.haml
index c5999317597..d315e623ae2 100644
--- a/app/views/groups/runners/edit.html.haml
+++ b/app/views/groups/runners/edit.html.haml
@@ -1,14 +1,16 @@
+- runner_name = "##{@runner.id} (#{@runner.short_sha})"
- breadcrumb_title _('Edit')
-- page_title _('Edit'), "##{@runner.id} (#{@runner.short_sha})"
-
+- page_title _('Edit'), runner_name
- add_to_breadcrumbs _('Runners'), group_runners_path(@group)
-- add_to_breadcrumbs "#{@runner.short_sha}", group_runner_path(@group, @runner)
-
+- add_to_breadcrumbs runner_name, group_runner_path(@group, @runner)
-%h1.page-title.gl-font-size-h-display
- = s_('Runners|Runner #%{runner_id}' % { runner_id: @runner.id })
- = render 'shared/runners/runner_type_badge', runner: @runner
+- if Feature.enabled?(:group_runner_edit_vue_ui, @group)
+ #js-group-runner-edit{ data: {runner_id: @runner.id, runner_path: group_runner_path(@group, @runner) } }
+- else
+ %h1.page-title.gl-font-size-h-display
+ = s_('Runners|Runner #%{runner_id}' % { runner_id: @runner.id })
+ = render 'shared/runners/runner_type_badge', runner: @runner
-= render 'shared/runners/runner_type_alert', runner: @runner
+ = render 'shared/runners/runner_type_alert', runner: @runner
-= render 'shared/runners/form', runner: @runner, runner_form_url: group_runner_path(@group, @runner)
+ = render 'shared/runners/form', runner: @runner, runner_form_url: group_runner_path(@group, @runner)