diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-25 12:08:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-25 12:08:47 +0300 |
commit | f71f0f5307d836c4b0a7e501e4af799a536f3454 (patch) | |
tree | 96a16aeb2ece04f78aa95e84c8fd9da973824a5d /app/assets/javascripts/vue_merge_request_widget/components | |
parent | e83b20c4f32415ecc6c76a33d6259bfca13ec250 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue index 9541058ec2a..41d35f68790 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue @@ -417,6 +417,7 @@ export default { } this.isMakingRequest = true; + this.editCommitMessage = false; if (!useAutoMerge) { this.mr.transitionStateMachine({ transition: MERGE }); @@ -663,7 +664,11 @@ export default { <gl-sprintf v-else :message="mergeDisabledText" /> </div> <template v-if="glFeatures.restructuredMrWidget"> - <div v-show="editCommitMessage" class="gl-w-full gl-order-n1"> + <div + v-if="editCommitMessage" + class="gl-w-full gl-order-n1" + data-testid="edit_commit_message" + > <ul :class="{ 'content-list': !glFeatures.restructuredMrWidget, |