Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
bdfd163a
Commit
bdfd163a
authored
Jun 05, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add info about WIP merge requests to docs.
parent
1f78aeba
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
3 deletions
+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
No files found.
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
bdfd163a
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
.automerge_widget.cannot_be_merged.hide
.automerge_widget.cannot_be_merged.hide
%h4
%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
You can try it manually on the
%strong
%strong
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
...
@@ -63,14 +63,14 @@
...
@@ -63,14 +63,14 @@
.automerge_widget.work_in_progress.hide
.automerge_widget.work_in_progress.hide
%h4
%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
%p
%button
.btn.disabled
{
:type
=>
'button'
}
%button
.btn.disabled
{
:type
=>
'button'
}
%i
.fa.fa-warning
%i
.fa.fa-warning
Accept Merge Request
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
.automerge_widget.unchecked
%p
%p
...
...
doc/workflow/README.md
View file @
bdfd163a
...
@@ -16,3 +16,4 @@
...
@@ -16,3 +16,4 @@
-
[
Change your time zone
](
timezone.md
)
-
[
Change your time zone
](
timezone.md
)
-
[
Keyboard shortcuts
](
shortcuts.md
)
-
[
Keyboard shortcuts
](
shortcuts.md
)
-
[
Web Editor
](
web_editor.md
)
-
[
Web Editor
](
web_editor.md
)
-
[
"Work In Progress" Merge Requests
](
wip_merge_requests.md
)
doc/workflow/wip_merge_requests.md
0 → 100644
View file @
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
View file @
bdfd163a
63.7 KB
doc/workflow/wip_merge_requests/mark_as_wip.png
0 → 100644
View file @
bdfd163a
40.6 KB
doc/workflow/wip_merge_requests/unmark_as_wip.png
0 → 100644
View file @
bdfd163a
31.4 KB
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment