summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-06-07 13:02:55 +0200
committerRémy Coutable <remy@rymai.me>2016-06-10 13:08:56 +0200
commitef7acbc597ed4ef62948934a2d032927c037ce9d (patch)
treeea3707d9540cbf69897180b649c6e0492f9e6a65
parentccb19b831940911d45f2fdd52d243bd101bf807e (diff)
downloadgitlab-ce-ruianderson/gitlab-ce-option-to-allow-or-not-merge-failed-builds.tar.gz
Add documentation for the 'only_allow_merge_if_build_succeeds.rb' featureruianderson/gitlab-ce-option-to-allow-or-not-merge-failed-builds
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--doc/workflow/merge_requests.md11
-rw-r--r--doc/workflow/merge_requests/only_allow_merge_if_build_succeeds.pngbin0 -> 17552 bytes
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/workflow/merge_requests.md b/doc/workflow/merge_requests.md
index 1b5718c91c1..d2ec56e6504 100644
--- a/doc/workflow/merge_requests.md
+++ b/doc/workflow/merge_requests.md
@@ -2,6 +2,17 @@
Merge requests allow you to exchange changes you made to source code
+## Only allow merge requests to be merged if the build succeeds
+
+You can prevent merge requests from being merged if their build did not succeed
+in the project settings page.
+
+![only_allow_merge_if_build_succeeds](merge_requests/only_allow_merge_if_build_succeeds.png)
+
+Navigate to project settings page and select the `Only allow merge requests to be merged if the build succeeds` check box.
+
+Please note that you need to have builds configured to enable this feature.
+
## Checkout merge requests locally
Locate the section for your GitLab remote in the `.git/config` file. It looks like this:
diff --git a/doc/workflow/merge_requests/only_allow_merge_if_build_succeeds.png b/doc/workflow/merge_requests/only_allow_merge_if_build_succeeds.png
new file mode 100644
index 00000000000..18bebf5fe92
--- /dev/null
+++ b/doc/workflow/merge_requests/only_allow_merge_if_build_succeeds.png
Binary files differ