Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
bdfd163a
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,发现更多精彩内容 >>
提交
bdfd163a
编写于
6月 05, 2015
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add info about WIP merge requests to docs.
上级
1f78aeba
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
17 addition
and
3 deletion
+17
-3
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+3
-3
doc/workflow/README.md
doc/workflow/README.md
+1
-0
doc/workflow/wip_merge_requests.md
doc/workflow/wip_merge_requests.md
+13
-0
doc/workflow/wip_merge_requests/blocked_accept_button.png
doc/workflow/wip_merge_requests/blocked_accept_button.png
+0
-0
doc/workflow/wip_merge_requests/mark_as_wip.png
doc/workflow/wip_merge_requests/mark_as_wip.png
+0
-0
doc/workflow/wip_merge_requests/unmark_as_wip.png
doc/workflow/wip_merge_requests/unmark_as_wip.png
+0
-0
未找到文件。
app/views/projects/merge_requests/show/_mr_accept.html.haml
浏览文件 @
bdfd163a
...
...
@@ -49,7 +49,7 @@
.automerge_widget.cannot_be_merged.hide
%h4
This
pull
request contains merge conflicts that must be resolved.
This
merge
request contains merge conflicts that must be resolved.
You can try it manually on the
%strong
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
...
...
@@ -63,14 +63,14 @@
.automerge_widget.work_in_progress.hide
%h4
This
request cannot be merged because it is marked as
<strong>
Work In Progress
</strong>
.
This
merge request cannot be accepted because it is marked as Work In Progress
.
%p
%button
.btn.disabled
{
:type
=>
'button'
}
%i
.fa.fa-warning
Accept Merge Request
When the merge request is ready, remove the "WIP" prefix from the title to allow
merging
.
When the merge request is ready, remove the "WIP" prefix from the title to allow
it to be accepted
.
.automerge_widget.unchecked
%p
...
...
doc/workflow/README.md
浏览文件 @
bdfd163a
...
...
@@ -16,3 +16,4 @@
-
[
Change your time zone
](
timezone.md
)
-
[
Keyboard shortcuts
](
shortcuts.md
)
-
[
Web Editor
](
web_editor.md
)
-
[
"Work In Progress" Merge Requests
](
wip_merge_requests.md
)
doc/workflow/wip_merge_requests.md
0 → 100644
浏览文件 @
bdfd163a
# "Work In Progress" Merge Requests
To prevent merge requests from accidentally being accepted before they're completely ready, GitLab blocks the "Accept" button for merge requests that have been marked a
**Work In Progress**
.
![
Blocked Accept Button
](
wip_merge_requests/blocked_accept_button.png
)
To mark a merge request a Work In Progress, simply start its title with
`[WIP]`
or
`WIP:`
.
![
Mark as WIP
](
wip_merge_requests/mark_as_wip.png
)
To allow a Work In Progress merge request to be accepted again when it's ready, simply remove the
`WIP`
prefix.
![
Unark as WIP
](
wip_merge_requests/unmark_as_wip.png
)
doc/workflow/wip_merge_requests/blocked_accept_button.png
0 → 100644
浏览文件 @
bdfd163a
63.7 KB
doc/workflow/wip_merge_requests/mark_as_wip.png
0 → 100644
浏览文件 @
bdfd163a
40.6 KB
doc/workflow/wip_merge_requests/unmark_as_wip.png
0 → 100644
浏览文件 @
bdfd163a
31.4 KB
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录