Revert button for merges

Feedback tracker: http://feedback.gitlab.com/forums/176466-general/suggestions/6097006-revert-a-merge-request

Dev: https://dev.gitlab.org/gitlab/gitlabhq/issues/2299

I think this deserves more attention?

Reassigned to @rdavila

There are the basic tasks for the implementation of this feature:

• Add new revert button on the MR detail page
• Add new endpoint on Projects::MergeRequestsController which will be basically responsible for create the new branch and redirect to the new MR
• Generate the proper data for the new MR
  • Branch name with this format: revert-[original mr id]-[target branch name of the MR being reverted]
  • Title of the new MR will be: Revert "[original MR's title]"
  • Description of the new MR will be: Reverts [URL of the original MR]

Looks good to me

I'm adding the new Revert button on the top right corner of the MR detail page, if anyone have a better proposal I'm happy to change it :)

Unfortunately the revert commit ability from Rugged is only available on the edge version, I'm going to try to implement it via a system command.

@rdavila Revert is a response to the "Merged" event, so I would imagine it would be in the "Merged by ..." widget.

@DouweM nice suggestion, will consider that in the next update.

I'm going to put this feature on hold until the revert commit ability is released in Rugged. Initially I was trying to achieve this functionality by doing some work directly on the bare repository but that kind of approaches are not longer encouraged and bring bad remembers to the team :). cc/ @ayufan @DouweM

Assignee removed

Milestone changed to 8.4

@rdavila Let's wait for that Rugged revert_commit method and use that.

mentioned in merge request !1990 (merged)

Milestone changed to 8.5

I moved to 8.5 to manage expectations. If rugged adds revet_commit sooner we can build it sooner.

Added ~122770 label

Added feature proposal label

Added ~123454 label

mentioned in issue #4266 (moved)

I'm still not seeing the new version released: https://github.com/libgit2/rugged/blob/06330b84a54efbd2c8933184fb1f2dfd6e47fe50/CHANGELOG.md

:(

mentioned in issue #2767 (closed)

@rdavila new version is out, it seems. Can you update?

@JobV that's great news, I'm going to tackle this one after I'm done with my current issue.

@rdavila great! This is an important one, make sure to ask DZ for help when needed.

Reassigned to @rdavila

@dzaporozhets do you have an idea to get the merge commit id from two branches with rugged? I've only found some cli tools until now. The only thing that I've in mind now is to store the commit id after the merge has been performed, this means that revert will only work for MRs created after this feature is released.

The only thing that I've in mind now is to store the commit id after the merge has been performed, this means that revert will only work for MRs created after this feature is released.

@rdavila That's definitely the easiest/most performant way, and perfectly acceptable :)

@rdavila Keep in mind that with fast-forward merges in EE, there will be no merge commit. Once this is done in CE, make sure you create an MR for EE that doesn't save the merge commit ID for those merges, and doesn't show the Revert button if there isn't a merge commit ID.

thanks @DouweM I'm working on it :)

The only thing that I've in mind now is to store the commit id after the merge has been performed, this means that revert will only work for MRs created after this feature is released.

@rdavila @DouweM +1 from me too.

The MR linked to this issue has no milestone, but the issue is for 8.5. Will this be included (hopefully) in 8.5?

@voarsh That's the intention!

:)

@DouweM @JobV the current version of Rugged that includes the revert commit ability is a pre-release version(0.24.0b12). I suggest we should wait for a stable release before merging the Revert Commit functionality given I've found a bug the other day that I was playing with it: https://github.com/libgit2/rugged/issues/566

BTW, I've asked the authors about a possible ETA: https://twitter.com/rdavila/status/697821217018028032

One of the authors replied and he said that the current beta releases are solid and used at GitHub in production: https://twitter.com/vmg/status/697827471643844608

@DouweM please let me know if I should start working on the upgrade for gitlab_git

@rdavila Cool! Could you link him to the segfault issue so he can check that out?

@DouweM sure, will do that now.

Looks like they're going to fix it: https://github.com/libgit2/rugged/issues/566. Hope they release a new beta version with that fix.

They've made a test fix (MR/PR) (4 hours ago) so check on the MR/PR one of the authors are working on. :) (https://github.com/libgit2/rugged/pull/574)

@voarsh thanks. I'm going to wait for a new pre-release with the fix. If there are not a pre-release in the next few days then I'm going to use the current pre-release which is used by GitHub in production. cc/ @DouweM

mentioned in commit d3c24373

mentioned in commit d7511a4b

Status changed to closed by merge request !1990 (merged)

mentioned in commit a5c7aea3

mentioned in commit 0daef5bf

Mentioned in commit maxraab/gitlab-ce@0daef5bf