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/projects/runners | |
parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'app/views/projects/runners')
-rw-r--r-- | app/views/projects/runners/_group_runners.html.haml | 29 | ||||
-rw-r--r-- | app/views/projects/runners/_index.html.haml | 3 | ||||
-rw-r--r-- | app/views/projects/runners/_runner.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/runners/_shared_runners.html.haml | 7 | ||||
-rw-r--r-- | app/views/projects/runners/_specific_runners.html.haml | 12 | ||||
-rw-r--r-- | app/views/projects/runners/edit.html.haml | 2 |
6 files changed, 30 insertions, 25 deletions
diff --git a/app/views/projects/runners/_group_runners.html.haml b/app/views/projects/runners/_group_runners.html.haml index a24ada53bac..9415516d6f6 100644 --- a/app/views/projects/runners/_group_runners.html.haml +++ b/app/views/projects/runners/_group_runners.html.haml @@ -1,37 +1,40 @@ -- link = link_to _('Runners API'), help_page_path('api/runners.md') +- link = link_to _('Runner API'), help_page_path('api/runners.md') -%h3 - = _('Group Runners') +%h4 + = _('Group runners') .bs-callout.bs-callout-warning - = _('GitLab Group Runners can execute code for all the projects in this group.') - = _('They can be managed using the %{link}.').html_safe % { link: link } + = _('These runners are shared across projects in this group.') + %br + %br + = _('Group runners can be managed with the %{link}.').html_safe % { link: link } - if @project.group - %hr + %br + %br - if @project.group_runners_enabled? = link_to toggle_group_runners_project_runners_path(@project), class: 'btn btn-close', method: :post do - = _('Disable group Runners') + = _('Disable group runners') - else = link_to toggle_group_runners_project_runners_path(@project), class: 'btn btn-success btn-inverted', method: :post do - = _('Enable group Runners') + = _('Enable group runners') = _('for this project') - if !@project.group - = _('This project does not belong to a group and can therefore not make use of group Runners.') + = _('This project does not belong to a group and cannot make use of group runners.') - elsif @group_runners.empty? - = _('This group does not provide any group Runners yet.') + = _('This group does not have any group runners yet.') - if can?(current_user, :admin_pipeline, @project.group) - - group_link = link_to _('Group CI/CD settings'), group_settings_ci_cd_path(@project.group) + - group_link = link_to _("group's CI/CD settings."), group_settings_ci_cd_path(@project.group) = _('Group maintainers can register group runners in the %{link}').html_safe % { link: group_link } - else - = _('Ask your group maintainer to set up a group Runner.') + = _('Ask your group maintainer to set up a group runner.') - else %h4.underlined-title - = _('Available group Runners: %{runners}').html_safe % { runners: @group_runners.count } + = _('Available group runners: %{runners}').html_safe % { runners: @group_runners.count } %ul.bordered-list = render partial: 'projects/runners/runner', collection: @group_runners, as: :runner diff --git a/app/views/projects/runners/_index.html.haml b/app/views/projects/runners/_index.html.haml index ae4fee1e14c..a02bdac442b 100644 --- a/app/views/projects/runners/_index.html.haml +++ b/app/views/projects/runners/_index.html.haml @@ -1,8 +1,5 @@ = render 'shared/runners/runner_description' -%hr - -%p.lead= _('To start serving your jobs you can either add specific Runners to your project or use shared Runners') .row .col-sm-6 = render 'projects/runners/specific_runners' diff --git a/app/views/projects/runners/_runner.html.haml b/app/views/projects/runners/_runner.html.haml index 1a3ba690184..85bd0335b92 100644 --- a/app/views/projects/runners/_runner.html.haml +++ b/app/views/projects/runners/_runner.html.haml @@ -23,7 +23,7 @@ - else = link_to _('Resume'), resume_project_runner_path(@project, runner), method: :post, class: 'btn btn-success btn-sm' - if runner.belongs_to_one_project? - = link_to _('Remove Runner'), project_runner_path(@project, runner), data: { confirm: _("Are you sure?") }, method: :delete, class: 'btn btn-danger btn-sm' + = link_to _('Remove runner'), project_runner_path(@project, runner), data: { confirm: _("Are you sure?") }, method: :delete, class: 'btn btn-danger btn-sm' - else - runner_project = @project.runner_projects.find_by(runner_id: runner) # rubocop: disable CodeReuse/ActiveRecord = link_to _('Disable for this project'), project_runner_project_path(@project, runner_project), data: { confirm: _("Are you sure?") }, method: :delete, class: 'btn btn-danger btn-sm' diff --git a/app/views/projects/runners/_shared_runners.html.haml b/app/views/projects/runners/_shared_runners.html.haml index 4093f0a0719..fd8b4eb0d39 100644 --- a/app/views/projects/runners/_shared_runners.html.haml +++ b/app/views/projects/runners/_shared_runners.html.haml @@ -2,7 +2,8 @@ = render layout: 'shared/runners/shared_runners_description' do - if !isVueifySharedRunnersToggleEnabled - %hr + %br + %br - if @project.group&.shared_runners_setting == 'disabled_and_unoverridable' %h5.gl-text-red-500 = _('Shared runners disabled on group level') @@ -19,8 +20,8 @@ #toggle-shared-runners-form{ data: toggle_shared_runners_settings_data(@project) } - if @shared_runners_count == 0 - = _('This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area.') + = _('This GitLab instance does not provide any shared runners yet. Instance administrators can register shared runners in the admin area.') - else - %h4.underlined-title #{_('Available shared Runners:')} #{@shared_runners_count} + %h4.underlined-title #{_('Available shared runners:')} #{@shared_runners_count} %ul.bordered-list.available-shared-runners = render partial: 'projects/runners/runner', collection: @shared_runners, as: :runner diff --git a/app/views/projects/runners/_specific_runners.html.haml b/app/views/projects/runners/_specific_runners.html.haml index ed9e6aac346..3e325b80efd 100644 --- a/app/views/projects/runners/_specific_runners.html.haml +++ b/app/views/projects/runners/_specific_runners.html.haml @@ -1,7 +1,9 @@ -%h3 - = _('Specific Runners') +%h4 + = _('Specific runners') .bs-callout.help-callout + = _('These runners are specific to this project.') + %hr = render partial: 'ci/runner/how_to_setup_runner_automatically', locals: { type: 'specific', clusters_path: project_clusters_path(@project) } @@ -11,14 +13,16 @@ type: 'specific', reset_token_url: reset_registration_token_namespace_project_settings_ci_cd_path } +%hr + - if @project_runners.any? - %h4.underlined-title= _('Runners activated for this project') + %h4.underlined-title= _('Available specific runners') %ul.bordered-list.activated-specific-runners = render partial: 'projects/runners/runner', collection: @project_runners, as: :runner = paginate @project_runners, theme: "gitlab", param_name: "project_page", params: { expand_runners: true, anchor: 'js-runners-settings' } - if @assignable_runners.any? - %h4.underlined-title= _('Available specific runners') + %h4.underlined-title= _('Other available runners') %ul.bordered-list.available-specific-runners = render partial: 'projects/runners/runner', collection: @assignable_runners, as: :runner = paginate @assignable_runners, theme: "gitlab", param_name: "specific_page", :params => { :anchor => 'js-runners-settings'} diff --git a/app/views/projects/runners/edit.html.haml b/app/views/projects/runners/edit.html.haml index b9d8e154913..f93cd23c83e 100644 --- a/app/views/projects/runners/edit.html.haml +++ b/app/views/projects/runners/edit.html.haml @@ -1,4 +1,4 @@ -- page_title _('Edit'), "#{@runner.description} ##{@runner.id}", _('Runners') +- page_title _('Edit'), "#{@runner.description} ##{@runner.id}", _('runners') %h4 Runner ##{@runner.id} |