Skip to content
Snippets Groups Projects
Commit 5b0f492b authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files

Adds changelog entry

Replace "builds" in project settings

Replace "builds" in admin area
parent b5e24229
No related branches found
No related tags found
No related merge requests found
Showing with 30 additions and 26 deletions
Loading
Loading
@@ -12,7 +12,7 @@
= link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
 
.row-content-block.second-block
#{(@scope || 'all').capitalize} builds
#{(@scope || 'all').capitalize} jobs
 
%ul.content-list.builds-content-list.admin-builds-table
= render "projects/builds/table", builds: @builds, admin: true
Loading
Loading
@@ -20,9 +20,9 @@
%span
Groups
= nav_link path: 'builds#index' do
= link_to admin_builds_path, title: 'Builds' do
= link_to admin_builds_path, title: 'Jobs' do
%span
Builds
Jobs
= nav_link path: ['runners#index', 'runners#show'] do
= link_to admin_runners_path, title: 'Runners' do
%span
Loading
Loading
Loading
Loading
@@ -26,7 +26,7 @@
 
.bs-callout
%p
A 'Runner' is a process which runs a build.
A 'Runner' is a process which runs a job.
You can setup as many Runners as you need.
%br
Runners can be placed on separate users, servers, even on your local machine.
Loading
Loading
@@ -37,16 +37,16 @@
%ul
%li
%span.label.label-success shared
\- Runner runs builds from all unassigned projects
\- Runner runs jobs from all unassigned projects
%li
%span.label.label-info specific
\- Runner runs builds from assigned projects
\- Runner runs jobs from assigned projects
%li
%span.label.label-warning locked
\- 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 jobs
 
.append-bottom-20.clearfix
.pull-left
Loading
Loading
@@ -68,7 +68,7 @@
%th Runner token
%th Description
%th Projects
%th Builds
%th Jobs
%th Tags
%th Last contact
%th
Loading
Loading
Loading
Loading
@@ -11,13 +11,13 @@
 
- if @runner.shared?
.bs-callout.bs-callout-success
%h4 This Runner will process builds from ALL UNASSIGNED projects
%h4 This Runner will process jobs from ALL UNASSIGNED projects
%p
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
%h4 This Runner will process jobs only from ASSIGNED projects
%p You can't make this a shared Runner.
%hr
 
Loading
Loading
@@ -70,11 +70,11 @@
= paginate @projects, theme: "gitlab"
 
.col-md-6
%h4 Recent builds served by this Runner
%h4 Recent jobs served by this Runner
%table.table.ci-table.runner-builds
%thead
%tr
%th Build
%th Job
%th Status
%th Project
%th Commit
Loading
Loading
Loading
Loading
@@ -4,10 +4,10 @@
.checkbox.builds-feature
= form.label :only_allow_merge_if_build_succeeds do
= form.check_box :only_allow_merge_if_build_succeeds
%strong Only allow merge requests to be merged if the build succeeds
%strong Only allow merge requests to be merged if the pipeline succeeds
%br
%span.descr
Builds need to be configured to enable this feature.
Pipelines need to be configured to enable this feature.
= link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_pipeline_succeeds', anchor: 'only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds')
.checkbox
= form.label :only_allow_merge_if_all_discussions_are_resolved do
Loading
Loading
Loading
Loading
@@ -63,7 +63,7 @@
 
.row
.col-md-9.project-feature.nested
= feature_fields.label :builds_access_level, "Builds", class: 'label-light'
= feature_fields.label :builds_access_level, "Pipelines", class: 'label-light'
%span.help-block Submit, test and deploy your changes before merge
.col-md-3
= project_feature_access_select(:builds_access_level)
Loading
Loading
@@ -180,7 +180,7 @@
%p
The following items will NOT be exported:
%ul
%li Build traces and artifacts
%li Job traces and artifacts
%li LFS objects
%li Container registry images
%li CI variables
Loading
Loading
%h4 Build charts
%h4 Pipelines charts
%p
 
%span.cgreen
Loading
Loading
@@ -11,19 +11,19 @@
 
.prepend-top-default
%p.light
Builds for last week
Jobs for last week
(#{date_from_to(Date.today - 7.days, Date.today)})
%canvas#weekChart{ height: 200 }
 
.prepend-top-default
%p.light
Builds for last month
Jobs for last month
(#{date_from_to(Date.today - 30.days, Date.today)})
%canvas#monthChart{ height: 200 }
 
.prepend-top-default
%p.light
Builds for last year
Jobs for last year
%canvas#yearChart.padded{ height: 250 }
 
- [:week, :month, :year].each do |scope|
Loading
Loading
Loading
Loading
@@ -66,7 +66,7 @@
%span.input-group-addon /
%p.help-block
A regular expression that will be used to find the test coverage
output in the build trace. Leave blank to disable
output in the job trace. Leave blank to disable
= link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'test-coverage-parsing')
.bs-callout.bs-callout-info
%p Below are examples of regex for existing tools:
Loading
Loading
Loading
Loading
@@ -12,14 +12,14 @@
%ul
%li
%span.label.label-success active
\- Runner is active and can process any new builds
\- Runner is active and can process any new jobs
%li
%span.label.label-danger paused
\- Runner is paused and will not receive any new builds
\- Runner is paused and will not receive any new jobs
 
%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 jobs you can either add specific Runners to your project or use shared Runners
.row
.col-sm-6
= render 'specific_runners'
Loading
Loading
Loading
Loading
@@ -86,7 +86,7 @@
:plain
#{builds_trigger_url(@project.id, ref: 'REF_NAME')}?token=TOKEN
%h5.prepend-top-default
Pass build variables
Pass job variables
 
%p.light
Add
Loading
Loading
Loading
Loading
@@ -68,7 +68,7 @@
= f.label :build_events, class: 'list-label' do
%strong Build events
%p.light
This URL will be triggered when the build status changes
This URL will be triggered when the job status changes
%li
= f.check_box :pipeline_events, class: 'pull-left'
.prepend-left-20
Loading
Loading
---
title: Rename Builds to Pipelines, CI/CD Pipelines, or Jobs everywhere
merge_request: 8787
author:
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment