summaryrefslogtreecommitdiff
path: root/doc/workflow/merge_requests.md
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-06-13 14:00:19 +0200
committerJames Lopez <james@jameslopez.es>2016-06-13 14:00:19 +0200
commite83fc684a583140ce30644a7062f8470880fdf43 (patch)
tree6c2a2f52da54d58def135757fcb5f14db8dd8a20 /doc/workflow/merge_requests.md
parentf70c000924c82bc579310fe784a6df159d15618b (diff)
parent6f0c503397e184d2a68eec8d4285288abc29ce9a (diff)
downloadgitlab-ce-e83fc684a583140ce30644a7062f8470880fdf43.tar.gz
Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
# Conflicts: # Gemfile.lock # app/helpers/todos_helper.rb # app/models/todo.rb # app/views/projects/edit.html.haml # lib/gitlab/import_export/import_service.rb
Diffstat (limited to 'doc/workflow/merge_requests.md')
-rw-r--r--doc/workflow/merge_requests.md11
1 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: