diff options
author | Rémy Coutable <remy@rymai.me> | 2016-06-07 13:02:55 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-06-10 14:36:57 +0200 |
commit | 282674c1108bdd761f4027910a32396fe253bc95 (patch) | |
tree | facffed5051752379ecf5adf92aedeaab392f681 | |
parent | 6dff7c1771e0cfeb6906244649b3683090bc2929 (diff) | |
download | gitlab-ce-282674c1108bdd761f4027910a32396fe253bc95.tar.gz |
Add documentation for the 'only_allow_merge_if_build_succeeds.rb' feature
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r-- | doc/workflow/merge_requests.md | 11 | ||||
-rw-r--r-- | doc/workflow/merge_requests/only_allow_merge_if_build_succeeds.png | bin | 0 -> 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 Binary files differnew file mode 100644 index 00000000000..18bebf5fe92 --- /dev/null +++ b/doc/workflow/merge_requests/only_allow_merge_if_build_succeeds.png |