Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 2 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>