Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
da7fd761
Commit
da7fd761
authored
Nov 22, 2021
by
Amy Qualls
Committed by
Ezekiel Kigbo
Nov 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish UI messages when merge is unavailable
parent
fc1aff05
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
10 deletions
+12
-10
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue
...e_request_widget/components/states/mr_widget_archived.vue
+1
-1
ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_secondary_geo_node.vue
...widget/components/states/mr_widget_secondary_geo_node.vue
+3
-1
ee/app/views/projects/merge_requests/widget/open/_geo.html.haml
.../views/projects/merge_requests/widget/open/_geo.html.haml
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+6
-6
spec/frontend/vue_mr_widget/components/states/mr_widget_archived_spec.js
...ue_mr_widget/components/states/mr_widget_archived_spec.js
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue
View file @
da7fd761
...
@@ -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>
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_secondary_geo_node.vue
View file @
da7fd761
...
@@ -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"
...
...
ee/app/views/projects/merge_requests/widget/open/_geo.html.haml
View file @
da7fd761
%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.
locale/gitlab.pot
View file @
da7fd761
...
@@ -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 ""
...
...
spec/frontend/vue_mr_widget/components/states/mr_widget_archived_spec.js
View file @
da7fd761
...
@@ -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.
'
,
);
);
});
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment