Skip to content
Snippets Groups Projects

Maintain "force_remove_source_branch" options on Merge Request unless specified

What does this MR do?

Fixes a problem where Merge Requests were losing the state associated with the flag to remove the source branch upon merge

Are there points in the code the reviewer needs to double check?

Are further tests required?

Why was this MR needed?

Several issues about this have been reported

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Thanks for taking care of this :smiley_cat:

    Won't it close #22507 (closed) too?

  • Mark Fletcher Added 1 commit:

    Added 1 commit:

    • 6f750232 - Maintain "force_remove_source_branch" options on Merge Request unless specified
  • Mark Fletcher Resolved all discussions

    Resolved all discussions

  • @eservais I'm still not convinced that this will fix Ben's issue. If it does then that's great, but I'd rather keep that issue around in case there is another problem there.

  • Reassigned to @rymai

  • Rémy Coutable
  • Thanks a lot @markglenfletcher, nice find for an annoying bug (I'm setting it as ~"Pick into Stable" for %8.12 )! :) :thumbsup:

  • Rémy Coutable Added ~149423 label

    Added ~149423 label

  • Rémy Coutable Milestone changed to %8.12

    Milestone changed to %8.12

  • Nice find @markglenfletcher. I used to think I forgot to check the box, but now I know there was some quiet problem hiding all along.

  • Mark Fletcher Added 1 commit:

    Added 1 commit:

    • 467d4ef4 - Maintain "force_remove_source_branch" options on Merge Request unless specified
  • Mark Fletcher Resolved all discussions

    Resolved all discussions

  • Reassigned to @rymai

  • Rémy Coutable Enabled an automatic merge when the build for 467d4ef4 succeeds

    Enabled an automatic merge when the build for 467d4ef4 succeeds

  • That build! (╯°□°)╯︵ ┻━┻

  • @markglenfletcher Could you rebase? Maybe this is fixed on master already?

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading