1 files changed, 10 insertions, 6 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 3c2d8efaffc..1516b63f96d 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
@@ -59,6 +59,7 @@ export default {
   apollo: {
     state: {
       query: readyToMergeQuery,
+      fetchPolicy: fetchPolicies.NO_CACHE,
       variables() {
         return this.mergeRequestQueryVariables;
       },
@@ -119,6 +120,14 @@ export default {
         ) {
           if (mergeRequestMergeStatusUpdated) {
             this.state = mergeRequestMergeStatusUpdated;
+
+            if (!this.commitMessageIsTouched) {
+              this.commitMessage = mergeRequestMergeStatusUpdated.defaultMergeCommitMessage;
+            }
+
+            if (!this.squashCommitMessageIsTouched) {
+              this.squashCommitMessage = mergeRequestMergeStatusUpdated.defaultSquashCommitMessage;
+            }
           }
         },
       },
@@ -349,12 +358,6 @@ export default {
     eventHub.$on('ApprovalUpdated', this.updateGraphqlState);
     eventHub.$on('MRWidgetUpdateRequested', this.updateGraphqlState);
     eventHub.$on('mr.discussion.updated', this.updateGraphqlState);
-
-    if (this.glFeatures.widgetPipelinePassSubscriptionUpdate) {
-      this.$apollo.queries.state.setOptions({
-        fetchPolicy: fetchPolicies.NO_CACHE,
-      });
-    }
   },
   beforeDestroy() {
     eventHub.$off('ApprovalUpdated', this.updateGraphqlState);
@@ -610,6 +613,7 @@ export default {
                     :label="__('Merge commit message')"
                     input-id="merge-message-edit"
                     class="gl-m-0! gl-p-0!"
+                    data-testid="merge-commit-message"
                     @input="setCommitMessage"
                   >
                     <template #header>