Skip to content

G
gitlab-ce
Commit f26eeac1 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas
Browse files
Options

Merge branch 'selhorn-runner-settings-okr' into 'master' 

Runners: Updated UI text to match latest style

See merge request gitlab-org/gitlab!50403
parents 9f4f9ad4 c9d80688
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 168 deletions
app/views/ci/runner/_how_to_setup_runner.html.haml
View file @ f26eeac1
- 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?") }
app/views/ci/runner/_how_to_setup_runner_automatically.html.haml
View file @ f26eeac1
.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'
app/views/groups/runners/_group_runners.html.haml
View file @ f26eeac1
- 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 }
%p
= _('These runners are shared across projects in this group.')
= _('Group runners can be managed with the %{link}.').html_safe % { link: link }
-# Proper policies should be implemented per
-# https://gitlab.com/gitlab-org/gitlab-foss/issues/45894
......@@ -18,3 +18,4 @@
locals: { registration_token: @group.runners_token,
type: 'group',
reset_token_url: reset_registration_token_group_settings_ci_cd_path }
%br
app/views/groups/runners/_index.html.haml
View file @ f26eeac1
......@@ -2,8 +2,6 @@
%hr
%p.lead
= _('To start serving your jobs you can add Runners to your group')
.row
.col-sm-6
= render 'groups/runners/group_runners'
......@@ -11,7 +9,7 @@
= render 'groups/runners/shared_runners'
%h4.underlined-title
= _('Available Runners: %{runners}').html_safe % { runners: limited_counter_with_delimiter(@all_group_runners) }
= _('Available runners: %{runners}').html_safe % { runners: limited_counter_with_delimiter(@all_group_runners) }
-# haml-lint:disable NoPlainNodes
.row
......
app/views/groups/settings/ci_cd/show.html.haml
View file @ f26eeac1
......@@ -31,8 +31,8 @@
%button.btn.gl-button.btn-default.js-settings-toggle{ type: "button" }
= expanded ? _('Collapse') : _('Expand')
%p
= _("Runners are processes that pick up and execute jobs for GitLab. Here you can register and see your Runners for this project.")
= link_to s_('More information'), help_page_path('ci/runners/README')
= _("Runners are processes that pick up and execute CI/CD jobs for GitLab.")
= link_to s_('How do I configure runners?'), help_page_path('ci/runners/README')
.settings-content
= render 'groups/runners/index'
......
app/views/projects/runners/_group_runners.html.haml
View file @ f26eeac1
- 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
app/views/projects/runners/_index.html.haml
View file @ f26eeac1
= 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'
......
app/views/projects/runners/_runner.html.haml
View file @ f26eeac1
......@@ -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'
......
app/views/projects/runners/_shared_runners.html.haml
View file @ f26eeac1
......@@ -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
app/views/projects/runners/_specific_runners.html.haml
View file @ f26eeac1
%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'}
app/views/projects/runners/edit.html.haml
View file @ f26eeac1
- page_title _('Edit'), "#{@runner.description} ##{@runner.id}", _('Runners')
- page_title _('Edit'), "#{@runner.description} ##{@runner.id}", _('runners')
%h4 Runner ##{@runner.id}
......
app/views/projects/settings/ci_cd/show.html.haml
View file @ f26eeac1
......@@ -40,8 +40,8 @@
%button.btn.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand')
%p
= _("Runners are processes that pick up and execute jobs for GitLab. Here you can register and see your Runners for this project.")
= link_to s_('More information'), help_page_path('ci/runners/README')
= _("Runners are processes that pick up and execute CI/CD jobs for GitLab.")
= link_to s_('How do I configure runners?'), help_page_path('ci/runners/README')
.settings-content
= render 'projects/runners/index'
......
app/views/shared/runners/_form.html.haml
View file @ f26eeac1
......@@ -46,7 +46,7 @@
= _('Tags')
.col-sm-10
= f.text_field :tag_list, value: runner.tag_list.sort.join(', '), class: 'form-control'
.form-text.text-muted= _('You can configure jobs to use runners that are assigned specific tags. Separate tags with commas.')
.form-text.text-muted= _('You can set up jobs to only use runners with specific tags. Separate tags with commas.')
- if local_assigns[:in_gitlab_com_admin_context]
.form-group.row
= label_tag :public_projects_minutes_cost_factor, class: 'col-form-label col-sm-2' do
......
app/views/shared/runners/_runner_description.html.haml
View file @ f26eeac1
.light.gl-mt-3
%p
= _("You can set up as many Runners as you need to run your jobs.")
%br
= _('Runners can be placed on separate users, servers, and even on your local machine.')
= _("Register as many runners as you want. You can register runners as separate users, on separate servers, and on your local machine. Runners are either:")
%p
= _('Each Runner can be in one of the following states:')
%div
%ul
%li
%span.badge.badge-success active
= _('- Runner is active and can process any new jobs')
= _('- Available to run jobs.')
%li
%span.badge.badge-danger paused
= _('- Runner is paused and will not receive any new jobs')
= _('- Not available to run jobs.')
app/views/shared/runners/_shared_runners_description.html.haml
View file @ f26eeac1
- link = link_to _('MaxBuilds'), 'https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runnersmachine-section', target: '_blank'
%h3
%h4
= _('Shared runners')
.bs-callout.shared-runners-description
= _('These runners are shared across this GitLab instance.')
%p
- if Gitlab::CurrentSettings.shared_runners_text.present?
= markdown_field(Gitlab::CurrentSettings.current_application_settings, :shared_runners_text)
- else
......
changelogs/unreleased/selhorn-runner-settings-okr.yml 0 → 100644
View file @ f26eeac1
---
title: Updated UI text to match style guidelines
merge_request: 50403
author:
type: other
locale/gitlab.pot
View file @ f26eeac1
......@@ -1033,15 +1033,15 @@ msgstr ""
msgid ", or "
msgstr ""
msgid "- Available to run jobs."
msgstr ""
msgid "- Event"
msgid_plural "- Events"
msgstr[0] ""
msgstr[1] ""
msgid "- Runner is active and can process any new jobs"
msgstr ""
msgid "- Runner is paused and will not receive any new jobs"
msgid "- Not available to run jobs."
msgstr ""
msgid "- User"
......@@ -3405,6 +3405,9 @@ msgstr ""
msgid "Ancestors"
msgstr ""
msgid "And this registration token:"
msgstr ""
msgid "Anonymous"
msgstr ""
......@@ -3778,15 +3781,15 @@ msgstr ""
msgid "Are you sure you want to remove this list?"
msgstr ""
msgid "Are you sure you want to reset registration token?"
msgstr ""
msgid "Are you sure you want to reset the SCIM token? SCIM provisioning will stop working until the new token is updated."
msgstr ""
msgid "Are you sure you want to reset the health check token?"
msgstr ""
msgid "Are you sure you want to reset the registration token?"
msgstr ""
msgid "Are you sure you want to revoke this %{type}? This action cannot be undone."
msgstr ""
......@@ -3856,7 +3859,7 @@ msgstr ""
msgid "Ascending"
msgstr ""
msgid "Ask your group maintainer to set up a group Runner."
msgid "Ask your group maintainer to set up a group runner."
msgstr ""
msgid "Assertion consumer service URL"
......@@ -4259,16 +4262,16 @@ msgstr ""
msgid "Available ID"
msgstr ""
msgid "Available Runners: %{runners}"
msgid "Available for dependency and container scanning"
msgstr ""
msgid "Available for dependency and container scanning"
msgid "Available group runners: %{runners}"
msgstr ""
msgid "Available group Runners: %{runners}"
msgid "Available runners: %{runners}"
msgstr ""
msgid "Available shared Runners:"
msgid "Available shared runners:"
msgstr ""
msgid "Available specific runners"
......@@ -5806,7 +5809,7 @@ msgstr ""
msgid "Click %{link_to} to view the request."
msgstr ""
msgid "Click the button below to begin the install process by navigating to the Kubernetes page"
msgid "Click the button below."
msgstr ""
msgid "Click to expand it."
......@@ -10054,7 +10057,7 @@ msgstr ""
msgid "Disable for this project"
msgstr ""
msgid "Disable group Runners"
msgid "Disable group runners"
msgstr ""
msgid "Disable public access to Pages sites"
......@@ -10347,9 +10350,6 @@ msgstr ""
msgid "Dynamic Application Security Testing (DAST)"
msgstr ""
msgid "Each Runner can be in one of the following states:"
msgstr ""
msgid "Edit"
msgstr ""
......@@ -10695,7 +10695,7 @@ msgstr ""
msgid "Enable for this project"
msgstr ""
msgid "Enable group Runners"
msgid "Enable group runners"
msgstr ""
msgid "Enable header and footer in emails"
......@@ -12689,7 +12689,7 @@ msgstr ""
msgid "From merge request merge until deploy to production"
msgstr ""
msgid "From the Kubernetes cluster details view, install Runner from the applications list"
msgid "From the Kubernetes cluster details view, applications list, install GitLab Runner."
msgstr ""
msgid "Full name"
......@@ -13184,9 +13184,6 @@ msgstr ""
msgid "GitLab Billing Team."
msgstr ""
msgid "GitLab Group Runners can execute code for all the projects in this group."
msgstr ""
msgid "GitLab Import"
msgstr ""
......@@ -13610,9 +13607,6 @@ msgstr ""
msgid "Group Audit Events"
msgstr ""
msgid "Group CI/CD settings"
msgstr ""
msgid "Group Git LFS status:"
msgstr ""
......@@ -13628,9 +13622,6 @@ msgstr ""
msgid "Group Owner must have signed in with SAML before enabling Group Managed Accounts"
msgstr ""
msgid "Group Runners"
msgstr ""
msgid "Group SAML must be enabled to test"
msgstr ""
......@@ -13715,6 +13706,12 @@ msgstr ""
msgid "Group requires separate account"
msgstr ""
msgid "Group runners"
msgstr ""
msgid "Group runners can be managed with the %{link}."
msgstr ""
msgid "Group variables (inherited)"
msgstr ""
......@@ -14421,6 +14418,9 @@ msgstr ""
msgid "Housekeeping, export, path, transfer, remove, archive."
msgstr ""
msgid "How do I configure runners?"
msgstr ""
msgid "How does cleanup work?"
msgstr ""
......@@ -15099,10 +15099,10 @@ msgstr ""
msgid "Install"
msgstr ""
msgid "Install GitLab Runner"
msgid "Install GitLab Runner and ensure it's running."
msgstr ""
msgid "Install Runner on Kubernetes"
msgid "Install GitLab Runner on Kubernetes"
msgstr ""
msgid "Install a soft token authenticator like %{free_otp_link} or Google Authenticator from your application repository and use that app to scan this QR code. More information is available in the %{help_link_start}documentation%{help_link_end}."
......@@ -16489,9 +16489,6 @@ msgstr ""
msgid "Learn more about Auto DevOps"
msgstr ""
msgid "Learn more about Kubernetes"
msgstr ""
msgid "Learn more about License-Check"
msgstr ""
......@@ -20013,6 +20010,9 @@ msgstr ""
msgid "Other Labels"
msgstr ""
msgid "Other available runners"
msgstr ""
msgid "Other information"
msgstr ""
......@@ -23315,12 +23315,21 @@ msgstr ""
msgid "Register WebAuthn Device"
msgstr ""
msgid "Register a runner on a Kubernetes cluster. %{link_to_help_page}"
msgstr ""
msgid "Register as many runners as you want. You can register runners as separate users, on separate servers, and on your local machine. Runners are either:"
msgstr ""
msgid "Register device"
msgstr ""
msgid "Register now"
msgstr ""
msgid "Register the runner with this URL:"
msgstr ""
msgid "Register with two-factor app"
msgstr ""
......@@ -23446,9 +23455,6 @@ msgstr ""
msgid "Remove %{displayReference}"
msgstr ""
msgid "Remove Runner"
msgstr ""
msgid "Remove Zoom meeting"
msgstr ""
......@@ -23542,6 +23548,9 @@ msgstr ""
msgid "Remove reviewer"
msgstr ""
msgid "Remove runner"
msgstr ""
msgid "Remove secondary node"
msgstr ""
......@@ -24089,7 +24098,7 @@ msgstr ""
msgid "Reset key"
msgstr ""
msgid "Reset runners registration token"
msgid "Reset registration token"
msgstr ""
msgid "Reset template"
......@@ -24345,6 +24354,9 @@ msgstr ""
msgid "Run untagged jobs"
msgstr ""
msgid "Runner API"
msgstr ""
msgid "Runner is %{status}, last contact was %{runner_contact} ago"
msgstr ""
......@@ -24366,21 +24378,9 @@ msgstr ""
msgid "Runners"
msgstr ""
msgid "Runners API"
msgstr ""
msgid "Runners activated for this project"
msgstr ""
msgid "Runners are processes that pick up and execute CI/CD jobs for GitLab."
msgstr ""
msgid "Runners are processes that pick up and execute jobs for GitLab. Here you can register and see your Runners for this project."
msgstr ""
msgid "Runners can be placed on separate users, servers, and even on your local machine."
msgstr ""
msgid "Runners can be:"
msgstr ""
......@@ -25281,7 +25281,7 @@ msgstr ""
msgid "Select all"
msgstr ""
msgid "Select an existing Kubernetes cluster or create a new one"
msgid "Select an existing Kubernetes cluster or create a new one."
msgstr ""
msgid "Select assignee"
......@@ -25692,10 +25692,10 @@ msgstr ""
msgid "Set up Jira Integration"
msgstr ""
msgid "Set up a %{type} Runner automatically"
msgid "Set up a %{type} runner automatically"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgid "Set up a %{type} runner manually"
msgstr ""
msgid "Set up a hardware device as a second factor to sign in."
......@@ -26662,7 +26662,7 @@ msgstr ""
msgid "Spam log successfully submitted as ham."
msgstr ""
msgid "Specific Runners"
msgid "Specific runners"
msgstr ""
msgid "Specified URL cannot be used: \"%{reason}\""
......@@ -26671,9 +26671,6 @@ msgstr ""
msgid "Specify an e-mail address regex pattern to identify default internal users."
msgstr ""
msgid "Specify the following URL during the Runner setup:"
msgstr ""
msgid "Speed up your pipelines with Needs relationships"
msgstr ""
......@@ -26782,9 +26779,6 @@ msgstr ""
msgid "Start search"
msgstr ""
msgid "Start the Runner!"
msgstr ""
msgid "Start thread"
msgstr ""
......@@ -28577,10 +28571,16 @@ msgstr ""
msgid "These paths are protected for POST requests."
msgstr ""
msgid "These variables are configured in the parent group settings, and will be active in the current project in addition to the project variables."
msgid "These runners are shared across projects in this group."
msgstr ""
msgid "They can be managed using the %{link}."
msgid "These runners are shared across this GitLab instance."
msgstr ""
msgid "These runners are specific to this project."
msgstr ""
msgid "These variables are configured in the parent group settings, and will be active in the current project in addition to the project variables."
msgstr ""
msgid "Third Party Advisory Link"
......@@ -28610,7 +28610,7 @@ msgstr ""
msgid "This Cron pattern is invalid"
msgstr ""
msgid "This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area."
msgid "This GitLab instance does not provide any shared runners yet. Instance administrators can register shared runners in the admin area."
msgstr ""
msgid "This GitLab instance is licensed at the %{insufficient_license} tier. Geo is only available for users who have at least a Premium license."
......@@ -28763,7 +28763,7 @@ msgstr ""
msgid "This group cannot be invited to a project inside a group with enforced SSO"
msgstr ""
msgid "This group does not provide any group Runners yet."
msgid "This group does not have any group runners yet."
msgstr ""
msgid "This group has been scheduled for permanent removal on %{date}"
......@@ -28964,7 +28964,7 @@ msgstr ""
msgid "This project"
msgstr ""
msgid "This project does not belong to a group and can therefore not make use of group Runners."
msgid "This project does not belong to a group and cannot make use of group runners."
msgstr ""
msgid "This project does not have %{service_desk_link_start}Service Desk%{service_desk_link_end} enabled, so the user who created the issue will no longer receive email notifications about new activity."
......@@ -29568,12 +29568,6 @@ msgstr ""
msgid "To specify the notification level per project of a group you belong to, you need to visit project page and change notification level there."
msgstr ""
msgid "To start serving your jobs you can add Runners to your group"
msgstr ""
msgid "To start serving your jobs you can either add specific Runners to your project or use shared Runners"
msgstr ""
msgid "To unsubscribe from this issue, please paste the following link into your browser:"
msgstr ""
......@@ -30629,9 +30623,6 @@ msgstr ""
msgid "Use template"
msgstr ""
msgid "Use the following registration token during setup:"
msgstr ""
msgid "Use your global notification setting"
msgstr ""
......@@ -32138,9 +32129,6 @@ msgstr ""
msgid "You can always edit this later"
msgstr ""
msgid "You can configure jobs to use runners that are assigned specific tags. Separate tags with commas."
msgstr ""
msgid "You can create a new %{link}."
msgstr ""
......@@ -32165,9 +32153,6 @@ msgstr ""
msgid "You can easily contribute to them by requesting to join these groups."
msgstr ""
msgid "You can easily install a Runner on a Kubernetes cluster. %{link_to_help_page}"
msgstr ""
msgid "You can filter by 'days to merge' by clicking on the columns in the chart."
msgstr ""
......@@ -32240,7 +32225,7 @@ msgstr ""
msgid "You can see your chat accounts."
msgstr ""
msgid "You can set up as many Runners as you need to run your jobs."
msgid "You can set up jobs to only use runners with specific tags. Separate tags with commas."
msgstr ""
msgid "You can specify notification level per group or per project."
......@@ -33392,6 +33377,9 @@ msgstr ""
msgid "group members"
msgstr ""
msgid "group's CI/CD settings."
msgstr ""
msgid "groups"
msgstr ""
......@@ -34141,6 +34129,9 @@ msgstr ""
msgid "revised"
msgstr ""
msgid "runners"
msgstr ""
msgid "satisfied"
msgstr ""
......
spec/features/admin/admin_runners_spec.rb
View file @ f26eeac1
......@@ -23,7 +23,7 @@ RSpec.describe "Admin Runners" do
create(:ci_build, pipeline: pipeline, runner_id: runner.id)
visit admin_runners_path
expect(page).to have_text "Set up a shared Runner manually"
expect(page).to have_text "Set up a shared runner manually"
expect(page).to have_text "Runners currently online: 1"
end
......@@ -227,7 +227,7 @@ RSpec.describe "Admin Runners" do
end
it 'has all necessary texts including no runner message' do
expect(page).to have_text "Set up a shared Runner manually"
expect(page).to have_text "Set up a shared runner manually"
expect(page).to have_text "Runners currently online: 0"
expect(page).to have_text 'No runners found'
end
......@@ -389,7 +389,7 @@ RSpec.describe "Admin Runners" do
let(:page_token) { find('#registration_token').text }
before do
click_button 'Reset runners registration token'
click_button 'Reset registration token'
end
it 'changes registration token' do
......
spec/features/groups/settings/ci_cd_spec.rb
View file @ f26eeac1
......@@ -28,7 +28,7 @@ RSpec.describe 'Group CI/CD settings' do
let(:page_token) { find('#registration_token').text }
before do
click_button 'Reset runners registration token'
click_button 'Reset registration token'
end
it 'changes registration token' do
......
spec/features/projects/settings/pipelines_settings_spec.rb
View file @ f26eeac1
......@@ -183,7 +183,7 @@ RSpec.describe "Projects > Settings > Pipelines settings" do
let(:page_token) { find('#registration_token').text }
before do
click_button 'Reset runners registration token'
click_button 'Reset registration token'
end
it 'changes registration token' do
......
spec/features/runners_spec.rb
View file @ f26eeac1
......@@ -19,7 +19,7 @@ RSpec.describe 'Runners' do
it 'user can see a button to install runners on kubernetes clusters' do
visit project_runners_path(project)
expect(page).to have_link('Install Runner on Kubernetes', href: project_clusters_path(project))
expect(page).to have_link('Install GitLab Runner on Kubernetes', href: project_clusters_path(project))
end
end
......@@ -69,7 +69,7 @@ RSpec.describe 'Runners' do
visit project_runners_path(project)
within '.activated-specific-runners' do
click_on 'Remove Runner'
click_on 'Remove runner'
end
expect(page).not_to have_content(specific_runner.display_name)
......@@ -226,10 +226,10 @@ RSpec.describe 'Runners' do
it 'group runners are not available' do
visit project_runners_path(project)
expect(page).to have_content 'This group does not provide any group Runners yet'
expect(page).to have_content 'This group does not have any group runners yet.'
expect(page).to have_content 'Group maintainers can register group runners in the Group CI/CD settings'
expect(page).not_to have_content 'Ask your group maintainer to set up a group Runner'
expect(page).to have_content 'Group maintainers can register group runners in the group\'s CI/CD settings.'
expect(page).not_to have_content 'Ask your group maintainer to set up a group runner'
end
end
end
......@@ -241,7 +241,7 @@ RSpec.describe 'Runners' do
it 'group runners are not available' do
visit project_runners_path(project)
expect(page).to have_content 'This project does not belong to a group and can therefore not make use of group Runners.'
expect(page).to have_content 'This project does not belong to a group and cannot make use of group runners.'
end
end
......@@ -252,10 +252,10 @@ RSpec.describe 'Runners' do
it 'group runners are not available' do
visit project_runners_path(project)
expect(page).to have_content 'This group does not provide any group Runners yet.'
expect(page).to have_content 'This group does not have any group runners yet.'
expect(page).not_to have_content 'Group maintainers can register group runners in the Group CI/CD settings'
expect(page).to have_content 'Ask your group maintainer to set up a group Runner.'
expect(page).not_to have_content 'Group maintainers can register group runners in the group\'s CI/CD settings.'
expect(page).to have_content 'Ask your group maintainer to set up a group runner.'
end
end
......@@ -267,21 +267,21 @@ RSpec.describe 'Runners' do
it 'group runners are available' do
visit project_runners_path(project)
expect(page).to have_content 'Available group Runners: 1'
expect(page).to have_content 'Available group runners: 1'
expect(page).to have_content 'group-runner'
end
it 'group runners may be disabled for a project' do
visit project_runners_path(project)
click_on 'Disable group Runners'
click_on 'Disable group runners'
expect(page).to have_content 'Enable group Runners'
expect(page).to have_content 'Enable group runners'
expect(project.reload.group_runners_enabled).to be false
click_on 'Enable group Runners'
click_on 'Enable group runners'
expect(page).to have_content 'Disable group Runners'
expect(page).to have_content 'Disable group runners'
expect(project.reload.group_runners_enabled).to be true
end
end
......@@ -305,7 +305,7 @@ RSpec.describe 'Runners' do
it 'user can see a link to install runners on kubernetes clusters' do
visit group_settings_ci_cd_path(group)
expect(page).to have_link('Install Runner on Kubernetes', href: group_clusters_path(group))
expect(page).to have_link('Install GitLab Runner on Kubernetes', href: group_clusters_path(group))
end
end
......@@ -316,7 +316,7 @@ RSpec.describe 'Runners' do
visit group_settings_ci_cd_path(group)
expect(page).not_to have_content 'No runners found'
expect(page).to have_content 'Available Runners: 1'
expect(page).to have_content 'Available runners: 1'
expect(page).to have_content 'group-runner'
end
......@@ -396,7 +396,7 @@ RSpec.describe 'Runners' do
visit group_settings_ci_cd_path(group)
expect(page).not_to have_content 'No runners found'
expect(page).to have_content 'Available Runners: 1'
expect(page).to have_content 'Available runners: 1'
expect(page).to have_content 'project-runner'
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7