Merge branch 'axil/gitlab-ce-typos_runners_pages' into 'master'
Fix grammar and typos in Runners pages _Originally opened at !1791 by @axil._ - - - ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6547
This commit is contained in:
Achilleas Pipinellis
commit
33d1f5904c
8 changed files with 44 additions and 40 deletions
|
|
@ -5,8 +5,10 @@
|
|||
|
||||
%p.prepend-top-default
|
||||
%span
|
||||
To register a new runner you should enter the following registration token.
|
||||
With this token the runner will request a unique runner token and use that for future communication.
|
||||
To register a new Runner you should enter the following registration
|
||||
token.
|
||||
With this token the Runner will request a unique Runner token and use
|
||||
that for future communication.
|
||||
%br
|
||||
Registration token is
|
||||
%code{ id: 'runners-token' } #{current_application_settings.runners_registration_token}
|
||||
|
|
@ -24,27 +26,27 @@
|
|||
|
||||
.bs-callout
|
||||
%p
|
||||
A 'runner' is a process which runs a build.
|
||||
You can setup as many runners as you need.
|
||||
A 'Runner' is a process which runs a build.
|
||||
You can setup as many Runners as you need.
|
||||
%br
|
||||
Runners can be placed on separate users, servers, and even on your local machine.
|
||||
Runners can be placed on separate users, servers, even on your local machine.
|
||||
%br
|
||||
|
||||
%div
|
||||
%span Each runner can be in one of the following states:
|
||||
%span Each Runner can be in one of the following states:
|
||||
%ul
|
||||
%li
|
||||
%span.label.label-success shared
|
||||
\- run builds from all unassigned projects
|
||||
\- Runner runs builds from all unassigned projects
|
||||
%li
|
||||
%span.label.label-info specific
|
||||
\- run builds from assigned projects
|
||||
\- Runner runs builds from assigned projects
|
||||
%li
|
||||
%span.label.label-warning locked
|
||||
\- runner cannot be assigned to other projects
|
||||
\- Runner cannot be assigned to other projects
|
||||
%li
|
||||
%span.label.label-danger paused
|
||||
\- runner will not receive any new builds
|
||||
\- Runner will not receive any new builds
|
||||
|
||||
.append-bottom-20.clearfix
|
||||
.pull-left
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
- if @runner.shared?
|
||||
.bs-callout.bs-callout-success
|
||||
%h4 This runner will process builds from ALL UNASSIGNED projects
|
||||
%h4 This Runner will process builds from ALL UNASSIGNED projects
|
||||
%p
|
||||
If you want runners to build only specific projects, enable them in the table below.
|
||||
If you want Runners to build only specific projects, enable them in the table below.
|
||||
Keep in mind that this is a one way transition.
|
||||
- else
|
||||
.bs-callout.bs-callout-info
|
||||
%h4 This runner will process builds only from ASSIGNED projects
|
||||
%p You can't make this a shared runner.
|
||||
%h4 This Runner will process builds only from ASSIGNED projects
|
||||
%p You can't make this a shared Runner.
|
||||
%hr
|
||||
|
||||
.append-bottom-20
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
.row
|
||||
.col-md-6
|
||||
%h4 Restrict projects for this runner
|
||||
%h4 Restrict projects for this Runner
|
||||
- if @runner.projects.any?
|
||||
%table.table.assigned-projects
|
||||
%thead
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
= paginate @projects
|
||||
|
||||
.col-md-6
|
||||
%h4 Recent builds served by this runner
|
||||
%h4 Recent builds served by this Runner
|
||||
%table.table.builds.runner-builds
|
||||
%thead
|
||||
%tr
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
.col-sm-10
|
||||
.checkbox
|
||||
= f.check_box :active
|
||||
%span.light Paused runners don't accept new builds
|
||||
%span.light Paused Runners don't accept new builds
|
||||
.form-group
|
||||
= label :run_untagged, 'Run untagged jobs', class: 'control-label'
|
||||
.col-sm-10
|
||||
|
|
@ -33,6 +33,6 @@
|
|||
Tags
|
||||
.col-sm-10
|
||||
= f.text_field :tag_list, value: runner.tag_list.to_s, class: 'form-control'
|
||||
.help-block You can setup jobs to only use runners with specific tags
|
||||
.help-block You can setup jobs to only use Runners with specific tags
|
||||
.form-actions
|
||||
= f.submit 'Save changes', class: 'btn btn-save'
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
.pull-right
|
||||
- if @project_runners.include?(runner)
|
||||
- if runner.belongs_to_one_project?
|
||||
= link_to 'Remove runner', runner_path(runner), data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm'
|
||||
= link_to 'Remove Runner', runner_path(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)
|
||||
= link_to 'Disable for this project', namespace_project_runner_project_path(@project.namespace, @project, runner_project), data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm'
|
||||
|
|
|
|||
|
|
@ -1,24 +1,26 @@
|
|||
%h3 Shared runners
|
||||
%h3 Shared Runners
|
||||
|
||||
.bs-callout.bs-callout-warning.shared-runners-description
|
||||
- if shared_runners_text.present?
|
||||
= markdown(shared_runners_text, pipeline: 'plain_markdown')
|
||||
- else
|
||||
Shared runners execute code of different projects on the same Runner unless you configure GitLab Runner Autoscale with MaxBuilds 1 (which it is on GitLab.com).
|
||||
GitLab Shared Runners execute code of different projects on the same Runner
|
||||
unless you configure GitLab Runner Autoscale with MaxBuilds 1 (which it is
|
||||
on GitLab.com).
|
||||
%hr
|
||||
- if @project.shared_runners_enabled?
|
||||
= link_to toggle_shared_runners_namespace_project_runners_path(@project.namespace, @project), class: 'btn btn-warning', method: :post do
|
||||
Disable shared runners
|
||||
Disable shared Runners
|
||||
- else
|
||||
= link_to toggle_shared_runners_namespace_project_runners_path(@project.namespace, @project), class: 'btn btn-success', method: :post do
|
||||
Enable shared runners
|
||||
Enable shared Runners
|
||||
for this project
|
||||
|
||||
- if @shared_runners_count.zero?
|
||||
This GitLab server does not provide any shared runners yet.
|
||||
Please use specific runners or ask the administrator to create one.
|
||||
This GitLab server does not provide any shared Runners yet.
|
||||
Please use the specific Runners or ask your administrator to create one.
|
||||
- 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: 'runner', collection: @shared_runners, as: :runner
|
||||
- if @shared_runners_count > 10
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
%h3 Specific runners
|
||||
%h3 Specific Runners
|
||||
|
||||
.bs-callout.help-callout
|
||||
%h4 How to setup a new project specific runner
|
||||
%h4 How to setup a specific Runner for a new project
|
||||
|
||||
%ol
|
||||
%li
|
||||
Install GitLab Runner software.
|
||||
Checkout the #{link_to 'GitLab Runner section', 'https://about.gitlab.com/gitlab-ci/#gitlab-runner', target: '_blank'} to install it
|
||||
Install a Runner compatible with GitLab CI
|
||||
(checkout the #{link_to 'GitLab Runner section', 'https://about.gitlab.com/gitlab-ci/#gitlab-runner', target: '_blank'} for information on how to install it).
|
||||
%li
|
||||
Specify the following URL during runner setup:
|
||||
Specify the following URL during the Runner setup:
|
||||
%code #{ci_root_url(only_path: false)}
|
||||
%li
|
||||
Use the following registration token during setup:
|
||||
%code #{@project.runners_token}
|
||||
%li
|
||||
Start runner!
|
||||
Start the Runner!
|
||||
|
||||
|
||||
- if @project_runners.any?
|
||||
|
|
|
|||
|
|
@ -2,24 +2,24 @@
|
|||
|
||||
.light.prepend-top-default
|
||||
%p
|
||||
A 'runner' is a process which runs a build.
|
||||
You can setup as many runners as you need.
|
||||
A 'Runner' is a process which runs a build.
|
||||
You can setup as many Runners as you need.
|
||||
%br
|
||||
Runners can be placed on separate users, servers, and even on your local machine.
|
||||
|
||||
%p Each runner can be in one of the following states:
|
||||
%p Each Runner can be in one of the following states:
|
||||
%div
|
||||
%ul
|
||||
%li
|
||||
%span.label.label-success active
|
||||
\- runner is active and can process any new build
|
||||
\- Runner is active and can process any new builds
|
||||
%li
|
||||
%span.label.label-danger paused
|
||||
\- runner is paused and will not receive any new build
|
||||
\- Runner is paused and will not receive any new builds
|
||||
|
||||
%hr
|
||||
|
||||
%p.lead To start serving your builds you can either add specific runners to your project or use shared runners
|
||||
%p.lead To start serving your builds you can either add specific Runners to your project or use shared Runners
|
||||
.row
|
||||
.col-sm-6
|
||||
= render 'specific_runners'
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ describe "Runners" do
|
|||
|
||||
it "removes specific runner for project if this is last project for that runners" do
|
||||
within ".activated-specific-runners" do
|
||||
click_on "Remove runner"
|
||||
click_on "Remove Runner"
|
||||
end
|
||||
|
||||
expect(Ci::Runner.exists?(id: @specific_runner)).to be_falsey
|
||||
|
|
@ -75,7 +75,7 @@ describe "Runners" do
|
|||
end
|
||||
|
||||
it "enables shared runners" do
|
||||
click_on "Enable shared runners"
|
||||
click_on "Enable shared Runners"
|
||||
expect(@project.reload.shared_runners_enabled).to be_truthy
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue