diff options
author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /app/views/ci | |
parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'app/views/ci')
-rw-r--r-- | app/views/ci/runner/_how_to_setup_runner.html.haml | 24 | ||||
-rw-r--r-- | app/views/ci/runner/_how_to_setup_runner_automatically.html.haml | 15 | ||||
-rw-r--r-- | app/views/ci/variables/_index.html.haml | 2 |
3 files changed, 21 insertions, 20 deletions
diff --git a/app/views/ci/runner/_how_to_setup_runner.html.haml b/app/views/ci/runner/_how_to_setup_runner.html.haml index 4ea3b0f0fb9..fc3d5360f9b 100644 --- a/app/views/ci/runner/_how_to_setup_runner.html.haml +++ b/app/views/ci/runner/_how_to_setup_runner.html.haml @@ -1,21 +1,23 @@ -- link = link_to _("Install GitLab Runner"), 'https://docs.gitlab.com/runner/install/', target: '_blank' +- link = link_to _("Install GitLab Runner and ensure it's running."), 'https://docs.gitlab.com/runner/install/', target: '_blank' .gl-mb-3 - %h4= _("Set up a %{type} Runner manually") % { type: type } + %h5= _("Set up a %{type} runner manually") % { type: type } %ol %li = link.html_safe %li - = _("Specify the following URL during the Runner setup:") + = _("Register the runner with this URL:") + %br %code#coordinator_address= root_url(only_path: false) = clipboard_button(target: '#coordinator_address', title: _("Copy URL"), class: "btn-transparent btn-clipboard") - %li - = _("Use the following registration token during setup:") + %br + %br + = _("And this registration token:") + %br %code#registration_token= registration_token = clipboard_button(target: '#registration_token', title: _("Copy token"), class: "btn-transparent btn-clipboard") - .gl-mt-3.gl-mb-3 - = button_to _("Reset runners registration token"), reset_token_url, - method: :put, class: 'gl-button btn btn-default', - data: { confirm: _("Are you sure you want to reset registration token?") } - %li - = _("Start the Runner!") + +.gl-mt-3.gl-mb-3 += button_to _("Reset registration token"), reset_token_url, +method: :put, class: 'gl-button btn btn-default', +data: { confirm: _("Are you sure you want to reset the registration token?") } diff --git a/app/views/ci/runner/_how_to_setup_runner_automatically.html.haml b/app/views/ci/runner/_how_to_setup_runner_automatically.html.haml index 343abf6099e..7140c0f4e7c 100644 --- a/app/views/ci/runner/_how_to_setup_runner_automatically.html.haml +++ b/app/views/ci/runner/_how_to_setup_runner_automatically.html.haml @@ -1,22 +1,21 @@ -.gl-mb-3 - %h4= _('Set up a %{type} Runner automatically') % { type: type } +%h5= _('Set up a %{type} runner automatically') % { type: type } %p - - link_to_help_page = link_to(_('Learn more about Kubernetes'), + - link_to_help_page = link_to(_('Learn more.'), help_page_path('user/project/clusters/index'), target: '_blank', rel: 'noopener noreferrer') - = _('You can easily install a Runner on a Kubernetes cluster. %{link_to_help_page}').html_safe % { link_to_help_page: link_to_help_page } + = _('Register a runner on a Kubernetes cluster. %{link_to_help_page}').html_safe % { link_to_help_page: link_to_help_page } %ol %li - = _('Click the button below to begin the install process by navigating to the Kubernetes page') + = _('Click the button below.') %li - = _('Select an existing Kubernetes cluster or create a new one') + = _('Select an existing Kubernetes cluster or create a new one.') %li - = _('From the Kubernetes cluster details view, install Runner from the applications list') + = _('From the Kubernetes cluster details view, applications list, install GitLab Runner.') -= link_to _('Install Runner on Kubernetes'), += link_to _('Install GitLab Runner on Kubernetes'), clusters_path, class: 'gl-button btn btn-info' diff --git a/app/views/ci/variables/_index.html.haml b/app/views/ci/variables/_index.html.haml index 660fd1a48a7..3f6d60c2620 100644 --- a/app/views/ci/variables/_index.html.haml +++ b/app/views/ci/variables/_index.html.haml @@ -21,7 +21,7 @@ } } - if !@group && @project.group - .settings-header.border-top.prepend-top-20 + .settings-header.border-top.gl-mt-6 = render 'ci/group_variables/header' .settings-content.pr-0 = render 'ci/group_variables/index' |