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
027c8c36
Commit
027c8c36
authored
Jul 26, 2018
by
Constance Okoghenun
Committed by
Annabel Gray
Jul 26, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve ""Approved" is confusing / wrong wording in merge request widget"
parent
4f991989
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
8 deletions
+29
-8
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_body.vue
...ge_request_widget/components/approvals/approvals_body.vue
+4
-2
ee/changelogs/unreleased/5439-approved-is-confusing-wrong-wording-in-merge-request-widget.yml
...ed-is-confusing-wrong-wording-in-merge-request-widget.yml
+5
-0
ee/spec/javascripts/approvals/approvals_body_spec.js
ee/spec/javascripts/approvals/approvals_body_spec.js
+13
-2
locale/gitlab.pot
locale/gitlab.pot
+7
-4
No files found.
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_body.vue
View file @
027c8c36
...
...
@@ -71,7 +71,9 @@ export default {
}
if
(
this
.
approvalsLeft
===
0
)
{
return
s__
(
'
mrWidget|Approved
'
);
return
this
.
userCanApprove
?
s__
(
'
mrWidget|Merge request approved; you can approve additionally
'
)
:
s__
(
'
mrWidget|Merge request approved
'
);
}
if
(
this
.
suggestedApprovers
.
length
>=
1
)
{
...
...
@@ -126,7 +128,7 @@ export default {
})
.
catch
(()
=>
{
this
.
approving
=
false
;
Flash
(
s__
(
'
mrWidget|An error occured while submitting your approval.
'
));
Flash
(
s__
(
'
mrWidget|An error occur
r
ed while submitting your approval.
'
));
});
},
},
...
...
ee/changelogs/unreleased/5439-approved-is-confusing-wrong-wording-in-merge-request-widget.yml
0 → 100644
View file @
027c8c36
---
title
:
Changed copy for "Approved" state in merge request widget
merge_request
:
6635
author
:
Constance Okoghenun
type
:
changed
ee/spec/javascripts/approvals/approvals_body_spec.js
View file @
027c8c36
...
...
@@ -83,11 +83,22 @@ describe('Approvals Body Component', () => {
});
});
it
(
'
shows the "
Approved" text message when there is
enough approvals in place
'
,
done
=>
{
it
(
'
shows the "
Merge request approved" copy when there are
enough approvals in place
'
,
done
=>
{
vm
.
approvalsLeft
=
0
;
Vue
.
nextTick
(()
=>
{
expect
(
vm
.
approvalsRequiredStringified
).
toBe
(
'
Approved
'
);
expect
(
vm
.
approvalsRequiredStringified
).
toBe
(
'
Merge request approved
'
);
done
();
});
});
it
(
'
shows the correct copy when there are enough approvals in place but user can approve
'
,
done
=>
{
vm
.
approvalsLeft
=
0
;
vm
.
userCanApprove
=
true
;
Vue
.
nextTick
(()
=>
{
expect
(
vm
.
approvalsRequiredStringified
)
.
toBe
(
'
Merge request approved; you can approve additionally
'
);
done
();
});
});
...
...
locale/gitlab.pot
View file @
027c8c36
...
...
@@ -7545,15 +7545,12 @@ msgstr ""
msgid "mrWidget|An error occured while removing your approval."
msgstr ""
msgid "mrWidget|An error occured while submitting your approval."
msgid "mrWidget|An error occur
r
ed while submitting your approval."
msgstr ""
msgid "mrWidget|Approve"
msgstr ""
msgid "mrWidget|Approved"
msgstr ""
msgid "mrWidget|Approved by"
msgstr ""
...
...
@@ -7617,6 +7614,12 @@ msgstr ""
msgid "mrWidget|Merge locally"
msgstr ""
msgid "mrWidget|Merge request approved"
msgstr ""
msgid "mrWidget|Merge request approved; you can approve additionally"
msgstr ""
msgid "mrWidget|Merged by"
msgstr ""
...
...
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