MR: Rebase + "no fast forward"?

GitLab already allows to rebase a MR before merging. But for keeping commits together which belong to a specific feature the "no-fast-forward" is really handy.

Also, GitLab implies that the "no-fast-forward" is already implemented as one can adjust the commit message on merging evn of you select rebase.

I propose to also support "no-fast-forward" (and hide the commit-message modification text box in case this is not selected)

What version of GitLab are you using? I wonder if this was a bug that cropped up in 7.13 when satellites were removed. 7.13.5 restores satellites.

If satellites are used for the merge request, the "no-fast-forward" option is used here.

@stanhu This issue was filed against the version currently running on gitlab.com

@stanhu I just merged another MR on gitlab.com and checked rebase, but it was not rebased at all...

"Accepting merge requests" is not working as expected right now...

I just reviewed the GitLab EE code in detail. It looks to me that rebase only works at the moment if the project were forked. Local branches are merged using Rugged, and since Rugged operates directly on the bare repository, rebase is not possible.

This seems like an EE regression introduced in v7.13.

/cc: @dzaporozhets, @DouweM, @sytses

Thanks @stanhu I've crosslinked in https://gitlab.com/gitlab-org/gitlab-ee/issues/2#note_1936510

@stanhu @sytses we returned satellites in 7.13.5. Now merged is done only by satellites. Check you this code - https://gitlab.com/gitlab-org/gitlab-ee/blob/v7.13.5-ee/app/services/merge_requests/auto_merge_service.rb#L11.

So bug should be fixed in latest 7.13.

Is gitlab-foss#13460 (closed) related?

It would be nice if one could decide on a case by case basis wheter to create a merge commit or not (even for fast-forward merges).

Btw. is there a reason why I cannot rebase-push a merge request if it is in another repository?

Hi @mrtux,

First of all, thank you for raising an issue to help improve the GitLab product. We're sorry about this, but this particular issue has gone unnoticed for quite some time. To establish order in the GitLab-CE Issue Tracker, we must ensure that every issue is correctly labelled and triaged, to get the proper attention.

This issue will be closed, as it meets the following criteria:

• No activity in the past 4 months
• Unlabelled
• Unassigned
• It's not associated with a particular milestone

We'd like to ask you to help us out and determine whether this issue should be reopened.

If this issue is reporting a bug, please can you attempt to reproduce on the latest version of GitLab or GitLab.com, to help us to understand whether the bug still needs our attention.

If this issue is proposing a new feature, please can you verify whether the feature proposal is still relevant.

Thanks for your help

Added ~761915 label

Status changed to closed

Github recently added functionality like this:

See https://help.github.com/articles/merging-a-pull-request/, however this special case is not supported by GitHub.

Status changed to reopened

@mrtux Thanks for taking a look and helping with the triage.

Added 874211 gitlab-foss14213 ~13921 and removed ~761915 labels

moved from gitlab-foss#2293 (moved)