Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5b0f492b
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5b0f492b
编写于
1月 25, 2017
作者:
F
Filipa Lacerda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Adds changelog entry
Replace "builds" in project settings Replace "builds" in admin area
上级
b5e24229
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
30 addition
and
26 deletion
+30
-26
app/views/admin/builds/index.html.haml
app/views/admin/builds/index.html.haml
+1
-1
app/views/admin/dashboard/_head.html.haml
app/views/admin/dashboard/_head.html.haml
+2
-2
app/views/admin/runners/index.html.haml
app/views/admin/runners/index.html.haml
+5
-5
app/views/admin/runners/show.html.haml
app/views/admin/runners/show.html.haml
+4
-4
app/views/projects/_merge_request_merge_settings.html.haml
app/views/projects/_merge_request_merge_settings.html.haml
+2
-2
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+2
-2
app/views/projects/graphs/ci/_builds.haml
app/views/projects/graphs/ci/_builds.haml
+4
-4
app/views/projects/pipelines_settings/show.html.haml
app/views/projects/pipelines_settings/show.html.haml
+1
-1
app/views/projects/runners/index.html.haml
app/views/projects/runners/index.html.haml
+3
-3
app/views/projects/triggers/index.html.haml
app/views/projects/triggers/index.html.haml
+1
-1
app/views/shared/web_hooks/_form.html.haml
app/views/shared/web_hooks/_form.html.haml
+1
-1
changelogs/unreleased/17662-rename-builds.yml
changelogs/unreleased/17662-rename-builds.yml
+4
-0
未找到文件。
app/views/admin/builds/index.html.haml
浏览文件 @
5b0f492b
...
...
@@ -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
}
build
s
#{
(
@scope
||
'all'
).
capitalize
}
job
s
%ul
.content-list.builds-content-list.admin-builds-table
=
render
"projects/builds/table"
,
builds:
@builds
,
admin:
true
app/views/admin/dashboard/_head.html.haml
浏览文件 @
5b0f492b
...
...
@@ -20,9 +20,9 @@
%span
Groups
=
nav_link
path:
'builds#index'
do
=
link_to
admin_builds_path
,
title:
'
Build
s'
do
=
link_to
admin_builds_path
,
title:
'
Job
s'
do
%span
Build
s
Job
s
=
nav_link
path:
[
'runners#index'
,
'runners#show'
]
do
=
link_to
admin_runners_path
,
title:
'Runners'
do
%span
...
...
app/views/admin/runners/index.html.haml
浏览文件 @
5b0f492b
...
...
@@ -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.
...
...
@@ -37,16 +37,16 @@
%ul
%li
%span
.label.label-success
shared
\- Runner runs
build
s from all unassigned projects
\- Runner runs
job
s from all unassigned projects
%li
%span
.label.label-info
specific
\- Runner runs
build
s from assigned projects
\- Runner runs
job
s 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
build
s
\- Runner will not receive any new
job
s
.append-bottom-20.clearfix
.pull-left
...
...
@@ -68,7 +68,7 @@
%th
Runner token
%th
Description
%th
Projects
%th
Build
s
%th
Job
s
%th
Tags
%th
Last contact
%th
...
...
app/views/admin/runners/show.html.haml
浏览文件 @
5b0f492b
...
...
@@ -11,13 +11,13 @@
-
if
@runner
.
shared?
.bs-callout.bs-callout-success
%h4
This Runner will process
build
s from ALL UNASSIGNED projects
%h4
This Runner will process
job
s 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
build
s only from ASSIGNED projects
%h4
This Runner will process
job
s only from ASSIGNED projects
%p
You can't make this a shared Runner.
%hr
...
...
@@ -70,11 +70,11 @@
=
paginate
@projects
,
theme:
"gitlab"
.col-md-6
%h4
Recent
build
s served by this Runner
%h4
Recent
job
s served by this Runner
%table
.table.ci-table.runner-builds
%thead
%tr
%th
Build
%th
Job
%th
Status
%th
Project
%th
Commit
...
...
app/views/projects/_merge_request_merge_settings.html.haml
浏览文件 @
5b0f492b
...
...
@@ -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
Build
s need to be configured to enable this feature.
Pipeline
s 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
...
...
app/views/projects/edit.html.haml
浏览文件 @
5b0f492b
...
...
@@ -63,7 +63,7 @@
.row
.col-md-9.project-feature.nested
=
feature_fields
.
label
:builds_access_level
,
"
Build
s"
,
class:
'label-light'
=
feature_fields
.
label
:builds_access_level
,
"
Pipeline
s"
,
class:
'label-light'
%span
.help-block
Submit, test and deploy your changes before merge
.col-md-3
=
project_feature_access_select
(
:builds_access_level
)
...
...
@@ -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
...
...
app/views/projects/graphs/ci/_builds.haml
浏览文件 @
5b0f492b
%h4
Build
charts
%h4
Pipelines
charts
%p
%span
.cgreen
...
...
@@ -11,19 +11,19 @@
.prepend-top-default
%p
.light
Build
s for last week
Job
s for last week
(
#{
date_from_to
(
Date
.
today
-
7
.
days
,
Date
.
today
)
}
)
%canvas
#weekChart
{
height:
200
}
.prepend-top-default
%p
.light
Build
s for last month
Job
s for last month
(
#{
date_from_to
(
Date
.
today
-
30
.
days
,
Date
.
today
)
}
)
%canvas
#monthChart
{
height:
200
}
.prepend-top-default
%p
.light
Build
s for last year
Job
s for last year
%canvas
#yearChart
.padded
{
height:
250
}
-
[
:week
,
:month
,
:year
].
each
do
|
scope
|
...
...
app/views/projects/pipelines_settings/show.html.haml
浏览文件 @
5b0f492b
...
...
@@ -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:
...
...
app/views/projects/runners/index.html.haml
浏览文件 @
5b0f492b
...
...
@@ -12,14 +12,14 @@
%ul
%li
%span
.label.label-success
active
\- Runner is active and can process any new
build
s
\- Runner is active and can process any new
job
s
%li
%span
.label.label-danger
paused
\- Runner is paused and will not receive any new
build
s
\- Runner is paused and will not receive any new
job
s
%hr
%p
.lead
To start serving your
build
s you can either add specific Runners to your project or use shared Runners
%p
.lead
To start serving your
job
s you can either add specific Runners to your project or use shared Runners
.row
.col-sm-6
=
render
'specific_runners'
...
...
app/views/projects/triggers/index.html.haml
浏览文件 @
5b0f492b
...
...
@@ -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
...
...
app/views/shared/web_hooks/_form.html.haml
浏览文件 @
5b0f492b
...
...
@@ -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
...
...
changelogs/unreleased/17662-rename-builds.yml
0 → 100644
浏览文件 @
5b0f492b
---
title
:
Rename Builds to Pipelines, CI/CD Pipelines, or Jobs everywhere
merge_request
:
8787
author
:
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录