Merge branch 'aqualls-ui-merge-unavailable' into 'master'

Polish UI messages when merge is unavailable

See merge request gitlab-org/gitlab!74715

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue

@@ -20,7 +20,7 @@ export default {
     </div>
     <div class="media-body">
       <span class="bold">
-        {{ s__('mrWidget|This project is archived, write access has been disabled') }}
+        {{ s__('mrWidget|Merge unavailable: merge requests are read-only on archived projects.') }}
       </span>
     </div>
   </div>

ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_secondary_geo_node.vue

@@ -22,7 +22,9 @@ export default {
   <div class="media">
     <status-icon status="warning" show-disabled-button />
     <div class="media-body">
-      <span class="bold">{{ __('Merge requests are read-only in a secondary Geo node') }}</span>
+      <span class="bold">{{
+        __('Merge unavailable: merge requests are read-only in a secondary Geo node.')
+      }}</span>
       <a
         v-gl-tooltip
         :href="mr.geoSecondaryHelpPath"

ee/app/views/projects/merge_requests/widget/open/_geo.html.haml

 %h4
   = sprite_icon('warning-solid')
-  Merge requests are read-only in a secondary Geo node
+  Merge unavailable: merge requests are read-only in a secondary Geo node.

locale/gitlab.pot

@@ -21809,9 +21809,6 @@ msgstr ""
 msgid "Merge requests are a place to propose changes you've made to a project and discuss those changes with others"
 msgstr ""
 
-msgid "Merge requests are read-only in a secondary Geo node"
-msgstr ""
-
 msgid "Merge requests assigned to me"
 msgstr ""
 
@@ -21821,6 +21818,9 @@ msgstr ""
 msgid "Merge the branch and fix any conflicts that come up"
 msgstr ""
 
+msgid "Merge unavailable: merge requests are read-only in a secondary Geo node."
+msgstr ""
+
 msgid "Merge when pipeline succeeds"
 msgstr ""
 
@@ -41496,6 +41496,9 @@ msgstr ""
 msgid "mrWidget|Merge locally"
 msgstr ""
 
+msgid "mrWidget|Merge unavailable: merge requests are read-only on archived projects."
+msgstr ""
+
 msgid "mrWidget|Merged by"
 msgstr ""
 
@@ -41607,9 +41610,6 @@ msgstr ""
 msgid "mrWidget|This merge request failed to be merged automatically"
 msgstr ""
 
-msgid "mrWidget|This project is archived, write access has been disabled"
-msgstr ""
-
 msgid "mrWidget|To approve this merge request, please enter your password. This project requires all approvals to be authenticated."
 msgstr ""
 

spec/frontend/vue_mr_widget/components/states/mr_widget_archived_spec.js

@@ -25,7 +25,7 @@ describe('MRWidgetArchived', () => {
 
   it('renders information', () => {
     expect(vm.$el.querySelector('.bold').textContent.trim()).toEqual(
-      'This project is archived, write access has been disabled',
+      'Merge unavailable: merge requests are read-only on archived projects.',
     );
   });
 });