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
df267104
Commit
df267104
authored
Feb 26, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change case "Add Approval" -> "Add approval"
parent
e3c778e9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
9 deletions
+9
-9
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
+1
-1
ee/spec/features/projects/merge_requests/user_approves_merge_request_spec.rb
...ojects/merge_requests/user_approves_merge_request_spec.rb
+2
-2
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 @
df267104
...
@@ -81,8 +81,8 @@ the following is possible:
...
@@ -81,8 +81,8 @@ the following is possible:
!
[
Approve
](
img/approve.png
)
!
[
Approve
](
img/approve.png
)
-
If the required number of approvals has already been met, they can still
-
If the required number of approvals has already been met, they can still
approve it by clicking the displayed
**Add
A
pproval**
button.
approve it by clicking the displayed
**Add
a
pproval**
button.
!
[
Add
A
pproval
](
img/approve_additionally.png
)
!
[
Add
a
pproval
](
img/approve_additionally.png
)
---
---
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_body.js
View file @
df267104
...
@@ -55,7 +55,7 @@ export default {
...
@@ -55,7 +55,7 @@ export default {
approveButtonText
()
{
approveButtonText
()
{
let
approveButtonText
=
s__
(
'
mrWidget|Approve
'
);
let
approveButtonText
=
s__
(
'
mrWidget|Approve
'
);
if
(
this
.
approvalsLeft
<=
0
)
{
if
(
this
.
approvalsLeft
<=
0
)
{
approveButtonText
=
s__
(
'
mrWidget|Add
A
pproval
'
);
approveButtonText
=
s__
(
'
mrWidget|Add
a
pproval
'
);
}
}
return
approveButtonText
;
return
approveButtonText
;
},
},
...
...
ee/changelogs/unreleased/sh-rename-approve-additionally.yml
View file @
df267104
---
---
title
:
Rename "Approve Additionally" to "Add
A
pproval"
title
:
Rename "Approve Additionally" to "Add
a
pproval"
merge_request
:
merge_request
:
author
:
author
:
type
:
other
type
:
other
ee/spec/features/projects/merge_requests/user_approves_merge_request_spec.rb
View file @
df267104
...
@@ -58,13 +58,13 @@ describe 'User approves a merge request', :js do
...
@@ -58,13 +58,13 @@ describe 'User approves a merge request', :js do
wait_for_requests
wait_for_requests
expect
(
page
).
not_to
have_button
(
'Approve'
)
expect
(
page
).
not_to
have_button
(
'Approve'
)
expect
(
page
).
not_to
have_button
(
'Add
A
pproval'
)
expect
(
page
).
not_to
have_button
(
'Add
a
pproval'
)
end
end
def
sign_in_visit_merge_request
(
user
,
additional_approver
=
false
)
def
sign_in_visit_merge_request
(
user
,
additional_approver
=
false
)
sign_in
(
user
)
sign_in
(
user
)
visit
(
merge_request_path
(
merge_request
))
visit
(
merge_request_path
(
merge_request
))
button_text
=
additional_approver
?
'Add
A
pproval'
:
'Approve'
button_text
=
additional_approver
?
'Add
a
pproval'
:
'Approve'
click_button
(
button_text
)
click_button
(
button_text
)
wait_for_requests
wait_for_requests
sign_out
(
user
)
sign_out
(
user
)
...
...
locale/gitlab.pot
View file @
df267104
...
@@ -4085,7 +4085,7 @@ msgstr ""
...
@@ -4085,7 +4085,7 @@ msgstr ""
msgid "mrWidget|Approve"
msgid "mrWidget|Approve"
msgstr ""
msgstr ""
msgid "mrWidget|Add
A
pproval"
msgid "mrWidget|Add
a
pproval"
msgstr ""
msgstr ""
msgid "mrWidget|Approved by"
msgid "mrWidget|Approved by"
...
...
spec/javascripts/approvals/approvals_body_spec.js
View file @
df267104
...
@@ -115,13 +115,13 @@ import ApprovalsBody from 'ee/vue_merge_request_widget/components/approvals/appr
...
@@ -115,13 +115,13 @@ import ApprovalsBody from 'ee/vue_merge_request_widget/components/approvals/appr
});
});
});
});
it
(
'
The approve button should have the "Add
A
pproval" text
'
,
function
(
done
)
{
it
(
'
The approve button should have the "Add
a
pproval" text
'
,
function
(
done
)
{
this
.
approvalsBody
.
approvalsLeft
=
0
;
this
.
approvalsBody
.
approvalsLeft
=
0
;
this
.
approvalsBody
.
userHasApproved
=
false
;
this
.
approvalsBody
.
userHasApproved
=
false
;
this
.
approvalsBody
.
userCanApprove
=
true
;
this
.
approvalsBody
.
userCanApprove
=
true
;
Vue
.
nextTick
(()
=>
{
Vue
.
nextTick
(()
=>
{
expect
(
this
.
approvalsBody
.
approveButtonText
).
toBe
(
'
Add
A
pproval
'
);
expect
(
this
.
approvalsBody
.
approveButtonText
).
toBe
(
'
Add
a
pproval
'
);
done
();
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