summaryrefslogtreecommitdiff
path: root/doc/user/project/merge_requests
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-09-05 12:13:11 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-09-05 12:13:11 +0200
commit7973a22ff4f3ca4d34f69864e2438f1e44c1cfe2 (patch)
treef3e77b183a8718b57df77b0c06f89ed08c885b41 /doc/user/project/merge_requests
parentbeb0b666dc000d51b7ed0eb264bd04ca466117d1 (diff)
downloadgitlab-ce-7973a22ff4f3ca4d34f69864e2438f1e44c1cfe2.tar.gz
Move `workflow/merge_requests.md` to `user/project/merge_requests.md`
Diffstat (limited to 'doc/user/project/merge_requests')
-rw-r--r--doc/user/project/merge_requests/img/commit_compare.pngbin0 -> 65010 bytes
-rw-r--r--doc/user/project/merge_requests/img/merge_request_diff.pngbin0 -> 103239 bytes
-rw-r--r--doc/user/project/merge_requests/img/merge_request_diff_without_whitespace.pngbin0 -> 71896 bytes
-rw-r--r--doc/user/project/merge_requests/img/only_allow_merge_if_build_succeeds.pngbin0 -> 17552 bytes
-rw-r--r--doc/user/project/merge_requests/img/versions.pngbin0 -> 100566 bytes
5 files changed, 0 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/img/commit_compare.png b/doc/user/project/merge_requests/img/commit_compare.png
new file mode 100644
index 00000000000..0e4a2b23c04
--- /dev/null
+++ b/doc/user/project/merge_requests/img/commit_compare.png
Binary files differ
diff --git a/doc/user/project/merge_requests/img/merge_request_diff.png b/doc/user/project/merge_requests/img/merge_request_diff.png
new file mode 100644
index 00000000000..3ebbfb75ea3
--- /dev/null
+++ b/doc/user/project/merge_requests/img/merge_request_diff.png
Binary files differ
diff --git a/doc/user/project/merge_requests/img/merge_request_diff_without_whitespace.png b/doc/user/project/merge_requests/img/merge_request_diff_without_whitespace.png
new file mode 100644
index 00000000000..a0db535019c
--- /dev/null
+++ b/doc/user/project/merge_requests/img/merge_request_diff_without_whitespace.png
Binary files differ
diff --git a/doc/user/project/merge_requests/img/only_allow_merge_if_build_succeeds.png b/doc/user/project/merge_requests/img/only_allow_merge_if_build_succeeds.png
new file mode 100644
index 00000000000..18bebf5fe92
--- /dev/null
+++ b/doc/user/project/merge_requests/img/only_allow_merge_if_build_succeeds.png
Binary files differ
diff --git a/doc/user/project/merge_requests/img/versions.png b/doc/user/project/merge_requests/img/versions.png
new file mode 100644
index 00000000000..c0a6dfe6806
--- /dev/null
+++ b/doc/user/project/merge_requests/img/versions.png
Binary files differ