gitlab-org--gitlab-foss/doc/workflow/merge_requests.md
Rémy Coutable 282674c110 Add documentation for the 'only_allow_merge_if_build_succeeds.rb' feature
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-10 14:36:57 +02:00

1.9 KiB

Merge Requests

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

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:

[remote "origin"]
  url = https://gitlab.com/gitlab-org/gitlab-ce.git
  fetch = +refs/heads/*:refs/remotes/origin/*

Now add the line fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/* to this section.

It should look like this:

[remote "origin"]
  url = https://gitlab.com/gitlab-org/gitlab-ce.git
  fetch = +refs/heads/*:refs/remotes/origin/*
  fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*

Now you can fetch all the merge requests requests:

$ git fetch origin
From https://gitlab.com/gitlab-org/gitlab-ce.git
 * [new ref]         refs/merge-requests/1/head -> origin/merge-requests/1
 * [new ref]         refs/merge-requests/2/head -> origin/merge-requests/2
...

To check out a particular merge request:

$ git checkout origin/merge-requests/1

Ignore whitespace changes in Merge Request diff view

MR diff

If you click the "Hide whitespace changes" button, you can see the diff without whitespace changes.

MR diff without whitespace

It is also working on commits compare view.

Commit Compare