Commit f8fed425 authored by Phil Hughes's avatar Phil Hughes

Fixes the delete source branch checkbox not working

This fixes the delete source branch checkbox not working
with the GraphQL flag enabled.
parent 62fd4967
...@@ -56,7 +56,10 @@ export default { ...@@ -56,7 +56,10 @@ export default {
mergeRequestsFfOnlyEnabled: data.project.mergeRequestsFfOnlyEnabled, mergeRequestsFfOnlyEnabled: data.project.mergeRequestsFfOnlyEnabled,
onlyAllowMergeIfPipelineSucceeds: data.project.onlyAllowMergeIfPipelineSucceeds, onlyAllowMergeIfPipelineSucceeds: data.project.onlyAllowMergeIfPipelineSucceeds,
}; };
this.removeSourceBranch = data.project.mergeRequest.shouldRemoveSourceBranch; this.removeSourceBranch =
data.project.mergeRequest.shouldRemoveSourceBranch ||
data.project.mergeRequest.forceRemoveSourceBranch ||
false;
this.commitMessage = data.project.mergeRequest.defaultMergeCommitMessage; this.commitMessage = data.project.mergeRequest.defaultMergeCommitMessage;
this.squashBeforeMerge = data.project.mergeRequest.squashOnMerge; this.squashBeforeMerge = data.project.mergeRequest.squashOnMerge;
this.isSquashReadOnly = data.project.squashReadOnly; this.isSquashReadOnly = data.project.squashReadOnly;
......
...@@ -5,6 +5,7 @@ fragment ReadyToMerge on Project { ...@@ -5,6 +5,7 @@ fragment ReadyToMerge on Project {
mergeRequest(iid: $iid) { mergeRequest(iid: $iid) {
autoMergeEnabled autoMergeEnabled
shouldRemoveSourceBranch shouldRemoveSourceBranch
forceRemoveSourceBranch
defaultMergeCommitMessage defaultMergeCommitMessage
defaultMergeCommitMessageWithDescription defaultMergeCommitMessageWithDescription
defaultSquashCommitMessage defaultSquashCommitMessage
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment