3 files changed, 9 insertions, 3 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 e294e1de976..2c113770d8b 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
@@ -88,7 +88,8 @@ export default {
     mergeButtonText() {
       if (this.isMergingImmediately) {
         return __('Merge in progress');
-      } else if (this.isAutoMergeAvailable) {
+      }
+      if (this.isAutoMergeAvailable) {
         return this.autoMergeText;
       }
 
@@ -306,7 +307,7 @@ export default {
             </template>
             <template v-else>
               <span class="bold js-resolve-mr-widget-items-message">
-                {{ __('You can only merge once the items above are resolved') }}
+                {{ mergeDisabledText }}
               </span>
             </template>
           </div>
diff --git a/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
index eef49e20159..40e6203599f 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
@@ -1,5 +1,7 @@
 import { __ } from '~/locale';
 
+export const MERGE_DISABLED_TEXT = __('You can only merge once the items above are resolved.');
+
 export default {
   computed: {
     isMergeButtonDisabled() {
@@ -11,6 +13,9 @@ export default {
           this.mr.preventMerge,
       );
     },
+    mergeDisabledText() {
+      return MERGE_DISABLED_TEXT;
+    },
     autoMergeText() {
       // MWPS is currently the only auto merge strategy available in CE
       return __('Merge when pipeline succeeds');
diff --git a/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js b/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js
index f637a44bf2d..8a229d80954 100644
--- a/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js
+++ b/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js
@@ -37,7 +37,7 @@ export default class MRWidgetService {
     // two endpoints are requested in order to get MR info:
     // one which is etag-cached and invalidated and another one which is not cached
     // the idea is to move all the fields to etag-cached endpoint and then perform only one request
-    // https://gitlab.com/gitlab-org/gitlab-ce/issues/61559#note_188801390
+    // https://gitlab.com/gitlab-org/gitlab-foss/issues/61559#note_188801390
     const getData = axios.get(this.endpoints.mergeRequestWidgetPath);
     const getCachedData = axios.get(this.endpoints.mergeRequestCachedWidgetPath);