GitLab

Closed

Open

Opened Feb 06, 2019 by totte @totteOwner26 of 31 tasks completed26/31 tasks

Set default merge request method

These are the current settings for all projects (as far as I know):

Merge commit - A merge commit is created for every merge, and merging is allowed as long as there are no conflicts.
Merge commit with semi-linear history - A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible. This way you could make sure that if this merge request would build, after merging to target branch it would also build. When fast-forward merge is not possible, the user is given the option to rebase.
Fast-forward merge - No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded. When fast-forward merge is not possible, the user is given the option to rebase.

(Text field)

Only allow merge requests to be merged if the pipeline succeeds - Pipelines need to be configured to enable this feature.
Only allow merge requests to be merged if all discussions are resolved
Automatically resolve merge request diff discussions when they become outdated
Show link to create/view merge request when pushing from the command line

Set the default merge method to Fast-forward merge for all projects.

Edited Feb 17, 2019 by totte

Assignee

Assign to

None

Milestone

None

Assign milestone

Time tracking

None

Due date

None

Reference: chakra/melange#35