Commit da7fd761 authored by Amy Qualls's avatar Amy Qualls Committed by Ezekiel Kigbo

Polish UI messages when merge is unavailable

parent fc1aff05
...@@ -20,7 +20,7 @@ export default { ...@@ -20,7 +20,7 @@ export default {
</div> </div>
<div class="media-body"> <div class="media-body">
<span class="bold"> <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> </span>
</div> </div>
</div> </div>
......
...@@ -22,7 +22,9 @@ export default { ...@@ -22,7 +22,9 @@ export default {
<div class="media"> <div class="media">
<status-icon status="warning" show-disabled-button /> <status-icon status="warning" show-disabled-button />
<div class="media-body"> <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 <a
v-gl-tooltip v-gl-tooltip
:href="mr.geoSecondaryHelpPath" :href="mr.geoSecondaryHelpPath"
......
%h4 %h4
= sprite_icon('warning-solid') = 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.
...@@ -21794,9 +21794,6 @@ msgstr "" ...@@ -21794,9 +21794,6 @@ msgstr ""
msgid "Merge requests are a place to propose changes you've made to a project and discuss those changes with others" msgid "Merge requests are a place to propose changes you've made to a project and discuss those changes with others"
msgstr "" msgstr ""
msgid "Merge requests are read-only in a secondary Geo node"
msgstr ""
msgid "Merge requests assigned to me" msgid "Merge requests assigned to me"
msgstr "" msgstr ""
...@@ -21806,6 +21803,9 @@ msgstr "" ...@@ -21806,6 +21803,9 @@ msgstr ""
msgid "Merge the branch and fix any conflicts that come up" msgid "Merge the branch and fix any conflicts that come up"
msgstr "" msgstr ""
msgid "Merge unavailable: merge requests are read-only in a secondary Geo node."
msgstr ""
msgid "Merge when pipeline succeeds" msgid "Merge when pipeline succeeds"
msgstr "" msgstr ""
...@@ -41454,6 +41454,9 @@ msgstr "" ...@@ -41454,6 +41454,9 @@ msgstr ""
msgid "mrWidget|Merge locally" msgid "mrWidget|Merge locally"
msgstr "" msgstr ""
msgid "mrWidget|Merge unavailable: merge requests are read-only on archived projects."
msgstr ""
msgid "mrWidget|Merged by" msgid "mrWidget|Merged by"
msgstr "" msgstr ""
...@@ -41565,9 +41568,6 @@ msgstr "" ...@@ -41565,9 +41568,6 @@ msgstr ""
msgid "mrWidget|This merge request failed to be merged automatically" msgid "mrWidget|This merge request failed to be merged automatically"
msgstr "" 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." msgid "mrWidget|To approve this merge request, please enter your password. This project requires all approvals to be authenticated."
msgstr "" msgstr ""
......
...@@ -25,7 +25,7 @@ describe('MRWidgetArchived', () => { ...@@ -25,7 +25,7 @@ describe('MRWidgetArchived', () => {
it('renders information', () => { it('renders information', () => {
expect(vm.$el.querySelector('.bold').textContent.trim()).toEqual( 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.',
); );
}); });
}); });
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment