Grzegorz Bizon
bc57fc7cb2
Update documentation according to changes in MWBS
2016-10-07 10:23:18 +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
Dmitriy Zaporozhets
a449124a76
Add changelog entry and documentation for merge request versions compare
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-07 10:24:48 +03:00
Achilleas Pipinellis
026d1acd26
Refactor authorization_for_merge_requests.md
2016-09-05 19:32:37 +02: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
cd93b90f85
Move authorization_for_merge_requests.md to new location
2016-09-05 12:36:14 +02:00
Achilleas Pipinellis
7973a22ff4
Move workflow/merge_requests.md to user/project/merge_requests.md
2016-09-05 12:13:11 +02:00
Sean McGivern
44eb3197a9
Handle non-UTF-8 conflicts gracefully
...
These can't be resolved in the UI because if they aren't in a UTF-8
compatible encoding, they can't be rendered as JSON. Even if they could,
we would be implicitly changing the file encoding anyway, which seems
like a bad idea.
2016-08-25 08:27:08 +01:00
Connor Shea
d8654744cd
Merge branch 'master' into diff-line-comment-vuejs
2016-08-17 12:10:09 -06:00
Achilleas Pipinellis
2257fda38e
Reference the version 'UI resolve conflicts' was introduced
...
[ci skip]
2016-08-17 15:34:53 +03:00
Connor Shea
1e7cbe0b05
Add documentation for discussion resolution.
2016-08-16 16:05:10 -06:00
Achilleas Pipinellis
523e1b1103
Init commit on documentation for resolving inline comments in MRs
2016-08-17 00:26:07 +03:00
Sean McGivern
b79378cae8
Add merge conflict docs
2016-08-12 23:24:49 +03:00
