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
e3c778e9
Commit
e3c778e9
authored
Feb 23, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename "Approve Additionally" to "Add Approval"
The former sounds awkward and unclear.
parent
440fc56b
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
12 deletions
+18
-12
doc/user/project/merge_requests/merge_request_approvals.md
doc/user/project/merge_requests/merge_request_approvals.md
+2
-2
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_body.js
...rge_request_widget/components/approvals/approvals_body.js
+1
-1
ee/changelogs/unreleased/sh-rename-approve-additionally.yml
ee/changelogs/unreleased/sh-rename-approve-additionally.yml
+5
-0
ee/spec/features/projects/merge_requests/user_approves_merge_request_spec.rb
...ojects/merge_requests/user_approves_merge_request_spec.rb
+7
-6
locale/gitlab.pot
locale/gitlab.pot
+1
-1
spec/javascripts/approvals/approvals_body_spec.js
spec/javascripts/approvals/approvals_body_spec.js
+2
-2
No files found.
doc/user/project/merge_requests/merge_request_approvals.md
View file @
e3c778e9
...
...
@@ -81,8 +81,8 @@ the following is possible:
!
[
Approve
](
img/approve.png
)
-
If the required number of approvals has already been met, they can still
approve it by clicking the displayed
**A
pprove additionally
**
button.
!
[
A
pprove additionally
](
img/approve_additionally.png
)
approve it by clicking the displayed
**A
dd Approval
**
button.
!
[
A
dd Approval
](
img/approve_additionally.png
)
---
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_body.js
View file @
e3c778e9
...
...
@@ -55,7 +55,7 @@ export default {
approveButtonText
()
{
let
approveButtonText
=
s__
(
'
mrWidget|Approve
'
);
if
(
this
.
approvalsLeft
<=
0
)
{
approveButtonText
=
s__
(
'
mrWidget|A
pprove additionally
'
);
approveButtonText
=
s__
(
'
mrWidget|A
dd Approval
'
);
}
return
approveButtonText
;
},
...
...
ee/changelogs/unreleased/sh-rename-approve-additionally.yml
0 → 100644
View file @
e3c778e9
---
title
:
Rename "Approve Additionally" to "Add Approval"
merge_request
:
author
:
type
:
other
ee/spec/features/projects/merge_requests/user_approves_merge_request_spec.rb
View file @
e3c778e9
...
...
@@ -42,13 +42,13 @@ describe 'User approves a merge request', :js do
sign_out
(
user
)
sign_in_visit_merge_request
(
user2
)
sign_in_visit_merge_request
(
user3
)
sign_in_visit_merge_request
(
user2
,
true
)
sign_in_visit_merge_request
(
user3
,
true
)
expect
(
all
(
'.js-approver-list-member'
).
count
).
to
eq
(
3
)
end
it
"doesn't show the a
pprove additionally
when a merge request is closed"
do
it
"doesn't show the a
dd approval
when a merge request is closed"
do
merge_request_closed
=
create
(
:merge_request
,
:closed
,
source_project:
project
,
target_project:
project
)
create
(
:approval
,
merge_request:
merge_request_closed
,
user:
user
)
...
...
@@ -58,13 +58,14 @@ describe 'User approves a merge request', :js do
wait_for_requests
expect
(
page
).
not_to
have_button
(
'Approve'
)
expect
(
page
).
not_to
have_button
(
'A
pprove additionally
'
)
expect
(
page
).
not_to
have_button
(
'A
dd Approval
'
)
end
def
sign_in_visit_merge_request
(
user
)
def
sign_in_visit_merge_request
(
user
,
additional_approver
=
false
)
sign_in
(
user
)
visit
(
merge_request_path
(
merge_request
))
click_button
(
'Approve'
)
button_text
=
additional_approver
?
'Add Approval'
:
'Approve'
click_button
(
button_text
)
wait_for_requests
sign_out
(
user
)
end
...
...
locale/gitlab.pot
View file @
e3c778e9
...
...
@@ -4085,7 +4085,7 @@ msgstr ""
msgid "mrWidget|Approve"
msgstr ""
msgid "mrWidget|A
pprove additionally
"
msgid "mrWidget|A
dd Approval
"
msgstr ""
msgid "mrWidget|Approved by"
...
...
spec/javascripts/approvals/approvals_body_spec.js
View file @
e3c778e9
...
...
@@ -115,13 +115,13 @@ import ApprovalsBody from 'ee/vue_merge_request_widget/components/approvals/appr
});
});
it
(
'
The approve button should have the "A
pprove additionally
" text
'
,
function
(
done
)
{
it
(
'
The approve button should have the "A
dd Approval
" text
'
,
function
(
done
)
{
this
.
approvalsBody
.
approvalsLeft
=
0
;
this
.
approvalsBody
.
userHasApproved
=
false
;
this
.
approvalsBody
.
userCanApprove
=
true
;
Vue
.
nextTick
(()
=>
{
expect
(
this
.
approvalsBody
.
approveButtonText
).
toBe
(
'
A
pprove additionally
'
);
expect
(
this
.
approvalsBody
.
approveButtonText
).
toBe
(
'
A
dd Approval
'
);
done
();
});
});
...
...
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