Achilleas Pipinellis
b72f43d053
Add docs for resolve conflicts editor
...
[ci skip]
2017-01-24 17:23:47 +01:00
Achilleas Pipinellis
bed476041f
Add images to issue creation from unresolved discussions
...
[ci skip]
2016-12-22 23:54:08 +02:00
Bob Van Landuyt
1123057ab7
Feature: delegate all open discussions to Issue
...
When a merge request can only be merged when all discussions are
resolved. This feature allows to easily delegate those discussions to a
new issue, while marking them as resolved in the merge request.
The user is presented with a new issue, prepared with mentions of all
unresolved discussions, including the first unresolved note of the
discussion, time and link to the note.
When the issue is created, the discussions in the merge request will get
a system note directing the user to the newly created issue.
2016-12-05 20:55:45 +01:00
Achilleas Pipinellis
af1dabe805
Reduce size of images from 25MB to 13MB using pngquant
...
Took it from https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/3232
[ci skip]
2016-11-22 19:53:43 +01:00
Rémy Coutable
065ba13058
Add documentation for the "Only allow merge requests to be merged if all discussions are resolved" feature
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-04 14:58:40 +01:00
Achilleas Pipinellis
e8c9ccc2d8
Refactor merge requests revisions
...
- A system note now appears on every push
- Replace dashes with underscores in images
[ci skip]
2016-10-14 10:25:11 +02:00
Dmitriy Zaporozhets
a1b7beeeda
Update merge request versions documentation with new screenshots
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-21 19:44:13 +03:00
Achilleas Pipinellis
bf00e0f4b2
Add links to new docs in merge_requests.md and workflow/README.md
2016-09-05 18:25:05 +02:00
Achilleas Pipinellis
99f28c50d5
Move merge request versions to its own document
2016-09-05 15:04:51 +02:00
Achilleas Pipinellis
4d77056af1
Move "Only allow merge requests to be merged if the build succeeds" to new location
2016-09-05 14:15:57 +02:00
Achilleas Pipinellis
a8ba5840e0
Move revert_changes.md to new location
2016-09-05 13:46:37 +02:00
Achilleas Pipinellis
14a96a1ad2
Move cherry_pick_changes.md to new location
2016-09-05 13:40:41 +02:00
Achilleas Pipinellis
99e03f80ca
Move wip_merge_requests.md to a new location
2016-09-05 13:33:45 +02:00
Achilleas Pipinellis
cbc97870bc
Move merge_when_build_succeeds.md to new location
2016-09-05 13:21:22 +02:00
Achilleas Pipinellis
7973a22ff4
Move workflow/merge_requests.md to user/project/merge_requests.md
2016-09-05 12:13:11 +02:00
Connor Shea
d8654744cd
Merge branch 'master' into diff-line-comment-vuejs
2016-08-17 12:10:09 -06:00
Connor Shea
1e7cbe0b05
Add documentation for discussion resolution.
2016-08-16 16:05:10 -06:00
Sean McGivern
b79378cae8
Add merge conflict docs
2016-08-12 23:24:49 +03:00
