Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
85d685c7
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,体验更适合开发者的 AI 搜索 >>
提交
85d685c7
编写于
9月 13, 2019
作者:
S
Samantha Ming
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move haml files to EE render partials
- create partials for code owner form, table, & table headers
上级
c858c35d
变更
8
展开全部
隐藏空白更改
内联
并排
Showing
8 changed file
with
2936 addition
and
7790 deletion
+2936
-7790
app/views/projects/protected_branches/shared/_branches_list.html.haml
...ojects/protected_branches/shared/_branches_list.html.haml
+3
-3
app/views/projects/protected_branches/shared/_create_protected_branch.html.haml
...tected_branches/shared/_create_protected_branch.html.haml
+1
-14
app/views/projects/protected_branches/shared/_protected_branch.html.haml
...cts/protected_branches/shared/_protected_branch.html.haml
+1
-8
doc/user/project/protected_branches.md
doc/user/project/protected_branches.md
+0
-4
ee/app/views/shared/projects/_code_owner_approval_form.html.haml
...views/shared/projects/_code_owner_approval_form.html.haml
+13
-0
ee/app/views/shared/projects/_code_owner_approval_table.html.haml
...iews/shared/projects/_code_owner_approval_table.html.haml
+8
-0
ee/app/views/shared/projects/_code_owner_approval_table_head.html.haml
...shared/projects/_code_owner_approval_table_head.html.haml
+3
-0
locale/gitlab.pot
locale/gitlab.pot
+2907
-7761
未找到文件。
app/views/projects/protected_branches/shared/_branches_list.html.haml
浏览文件 @
85d685c7
...
@@ -23,9 +23,9 @@
...
@@ -23,9 +23,9 @@
=
s_
(
"ProtectedBranch|Allowed to merge"
)
=
s_
(
"ProtectedBranch|Allowed to merge"
)
%th
%th
=
s_
(
"ProtectedBranch|Allowed to push"
)
=
s_
(
"ProtectedBranch|Allowed to push"
)
-
if
@project
.
merge_requests_require_code_owner_approval
%th
=
render_if_exists
'shared/projects/code_owner_approval_table_head'
=
s_
(
"ProtectedBranch|Code owner approval"
)
-
if
can_admin_project
-
if
can_admin_project
%th
%th
%tbody
%tbody
...
...
app/views/projects/protected_branches/shared/_create_protected_branch.html.haml
浏览文件 @
85d685c7
...
@@ -24,19 +24,6 @@
...
@@ -24,19 +24,6 @@
=
s_
(
"ProtectedBranch|Allowed to push:"
)
=
s_
(
"ProtectedBranch|Allowed to push:"
)
.col-md-10
.col-md-10
=
yield
:push_access_levels
=
yield
:push_access_levels
=
render_if_exists
'shared/projects/code_owner_approval_form'
-
if
@project
.
merge_requests_require_code_owner_approval
.form-group.row
%label
.col-md-2.text-right
{
for:
'code_owner_approval_required'
}
=
s_
(
"ProtectedBranch|Require approval from code owners:"
)
.col-md-10
%button
{
type:
'button'
,
class:
"js-project-feature-toggle project-feature-toggle is-checked"
,
"aria-label"
:
s_
(
"ProtectedBranch|Toggle code owner approval"
)
}
%span
.toggle-icon
=
sprite_icon
(
'status_success_borderless'
,
size:
16
,
css_class:
'toggle-icon-svg toggle-status-checked'
)
=
sprite_icon
(
'status_failed_borderless'
,
size:
16
,
css_class:
'toggle-icon-svg toggle-status-unchecked'
)
.form-text.text-muted
=
s_
(
"ProtectedBranch|Pushes that change filenames matched by the CODEOWNERS file will be rejected"
)
.card-footer
.card-footer
=
f
.
submit
s_
(
'ProtectedBranch|Protect'
),
class:
'btn-success btn'
,
disabled:
true
=
f
.
submit
s_
(
'ProtectedBranch|Protect'
),
class:
'btn-success btn'
,
disabled:
true
app/views/projects/protected_branches/shared/_protected_branch.html.haml
浏览文件 @
85d685c7
...
@@ -19,14 +19,7 @@
...
@@ -19,14 +19,7 @@
=
yield
=
yield
-
if
@project
.
merge_requests_require_code_owner_approval
=
render_if_exists
'shared/projects/code_owner_approval_table'
,
protected_branch:
protected_branch
%td
%button
{
type:
'button'
,
class:
"js-project-feature-toggle project-feature-toggle mr-5 #{'is-checked' if protected_branch.code_owner_approval_required}"
,
"aria-label"
:
s_
(
"ProtectedBranch|Toggle code owner approval"
)
}
%span
.toggle-icon
=
sprite_icon
(
'status_success_borderless'
,
size:
16
,
css_class:
'toggle-icon-svg toggle-status-checked'
)
=
sprite_icon
(
'status_failed_borderless'
,
size:
16
,
css_class:
'toggle-icon-svg toggle-status-unchecked'
)
-
if
can_admin_project
-
if
can_admin_project
%td
%td
...
...
doc/user/project/protected_branches.md
浏览文件 @
85d685c7
...
@@ -87,11 +87,7 @@ Click **Protect** and the branch will appear in the "Protected branch" list.
...
@@ -87,11 +87,7 @@ Click **Protect** and the branch will appear in the "Protected branch" list.
## Code Owners approvals **(PREMIUM)**
## Code Owners approvals **(PREMIUM)**
It is possible to require at least one approval for each entry in the
It is possible to require at least one approval for each entry in the
<<<<<<< HEAD
[
`CODEOWNERS` file
](
code_owners.md
)
that matches a file changed in
[
`CODEOWNERS` file
](
code_owners.md
)
that matches a file changed in
=======
[
`CODEOWNERS` file
](
../code_owners.md
)
that matches a file changed in
>>>>>>> Update docs to reflect changes to API and UI
the merge request. To enable this feature:
the merge request. To enable this feature:
1.
Toggle the
**Require approval from code owners**
slider.
1.
Toggle the
**Require approval from code owners**
slider.
...
...
ee/app/views/shared/projects/_code_owner_approval_form.html.haml
0 → 100644
浏览文件 @
85d685c7
-
if
@project
.
merge_requests_require_code_owner_approval
.form-group.row
%label
.col-md-2.text-right
{
for:
'code_owner_approval_required'
}
=
s_
(
"ProtectedBranch|Require approval from code owners:"
)
.col-md-10
%button
{
type:
'button'
,
class:
"js-project-feature-toggle project-feature-toggle is-checked"
,
"aria-label"
:
s_
(
"ProtectedBranch|Toggle code owner approval"
)
}
%span
.toggle-icon
=
sprite_icon
(
'status_success_borderless'
,
size:
16
,
css_class:
'toggle-icon-svg toggle-status-checked'
)
=
sprite_icon
(
'status_failed_borderless'
,
size:
16
,
css_class:
'toggle-icon-svg toggle-status-unchecked'
)
.form-text.text-muted
=
s_
(
"ProtectedBranch|Pushes that change filenames matched by the CODEOWNERS file will be rejected"
)
ee/app/views/shared/projects/_code_owner_approval_table.html.haml
0 → 100644
浏览文件 @
85d685c7
-
if
@project
.
merge_requests_require_code_owner_approval
%td
%button
{
type:
'button'
,
class:
"js-project-feature-toggle project-feature-toggle mr-5 #{'is-checked' if protected_branch.code_owner_approval_required}"
,
"aria-label"
:
s_
(
"ProtectedBranch|Toggle code owner approval"
)
}
%span
.toggle-icon
=
sprite_icon
(
'status_success_borderless'
,
size:
16
,
css_class:
'toggle-icon-svg toggle-status-checked'
)
=
sprite_icon
(
'status_failed_borderless'
,
size:
16
,
css_class:
'toggle-icon-svg toggle-status-unchecked'
)
ee/app/views/shared/projects/_code_owner_approval_table_head.html.haml
0 → 100644
浏览文件 @
85d685c7
-
if
@project
.
merge_requests_require_code_owner_approval
%th
=
s_
(
"ProtectedBranch|Code owner approval"
)
locale/gitlab.pot
浏览文件 @
85d685c7
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录