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
5cc1abf9
Commit
5cc1abf9
authored
May 19, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MRWidget: Only show remove approval button for merged MR.
parent
ffaccec7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
app/assets/javascripts/vue_merge_request_widget/ee/components/approvals/approvals_footer.js
...equest_widget/ee/components/approvals/approvals_footer.js
+2
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/ee/components/approvals/approvals_footer.js
View file @
5cc1abf9
...
...
@@ -46,7 +46,8 @@ export default {
},
computed
:
{
showUnapproveButton
()
{
return
this
.
userHasApproved
&&
!
this
.
userCanApprove
;
const
isMerged
=
this
.
mr
.
state
===
'
merged
'
;
return
this
.
userHasApproved
&&
!
this
.
userCanApprove
&&
!
isMerged
;
},
},
methods
:
{
...
...
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