Skip to content
Snippets Groups Projects
New issue look: Off

Some MRs can't be merged and don't show changes on Changes tab

    • Closed Issue created by Douwe Maan @DouweM

    Specifically, open MRs from a fork created before 8.0 where fork wasn't pushed to since 8.0 was deployed.

    Slightly edited Slack conversation:

    [09:49] Douwe Maan: I think what may be happening is that for older MRs, the branch and commits weren't copied into the target project like now happens with new MRs, so the Commits and Changes tabs look in the wrong place.

    [09:50] Dmitriy Zaporozhets: @douwe: basically this commit should exist in target branch

    [09:50] Dmitriy Zaporozhets: but fetch ref does not happen for existing MR

    [09:50] Dmitriy Zaporozhets: until you do some action (push)

    [09:51] Douwe Maan: Yes exactly, so the UI was now updated to reference the commit in the target branch where it doesn't exist for existing MR :disappointed:

    [09:56] Hannes Rosenögger: so we'd need a migration that copies the commits for existing mrs?

    [09:57] Douwe Maan: We can do it lazily upon request of the page, with something like before_action :ensure_ref_fetched (edited)

    [09:57] Hannes Rosenögger: that sounds good :simple_smile:

    [10:00] Douwe Maan: I think merging MRs from forks may also be broken now

    [10:05] Dmitriy Zaporozhets:

    I think merging MRs from forks may also be broken now

    yes it is

    [10:05] Dmitriy Zaporozhets: basically old MR from forks with non-updated branches are (edited)

    [10:08] Dmitriy Zaporozhets: @jacobvosmaer: can we count how many of such MR we have on GitLab.com?

    [10:08] Dmitriy Zaporozhets: so we can decide if it should be migration or before_filter

    Designs

    Child items ...

    • Activity

    Please register or sign in to reply