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
7e43ca99
Commit
7e43ca99
authored
Sep 05, 2017
by
Filipa Lacerda
Committed by
Phil Hughes
Sep 05, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes the gap in approvers in the MR widget
parent
c2865f7e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
31 deletions
+48
-31
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+8
-1
changelogs/unreleased-ee/37197-approved-gap.yml
changelogs/unreleased-ee/37197-approved-gap.yml
+5
-0
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_footer.js
...e_request_widget/components/approvals/approvals_footer.js
+35
-30
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
7e43ca99
...
...
@@ -724,7 +724,14 @@
.approvers-list
{
display
:
flex
;
align-items
:
center
;
margin-right
:
5px
;
}
.approvers-list
{
.link-to-member-avatar
:not
(
:first-child
)
{
img
{
margin-left
:
0
;
}
}
}
.unapprove-btn
{
...
...
changelogs/unreleased-ee/37197-approved-gap.yml
0 → 100644
View file @
7e43ca99
---
title
:
Fix the gap in approvals in merge request widget
merge_request
:
author
:
type
:
fixed
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_footer.js
View file @
7e43ca99
...
...
@@ -59,43 +59,48 @@ export default {
})
.
catch
(()
=>
{
this
.
unapproving
=
false
;
new
Flash
(
'
An error occured while removing your approval.
'
);
// eslint-disable-line
Flash
(
'
An error occured while removing your approval.
'
);
});
},
},
template
:
`
<div v-if="approvedBy.length" class="approved-by-users approvals-footer clearfix mr-info-list">
<div class="approvers-prefix space-children">
<div
v-if="approvedBy.length"
class="approved-by-users approvals-footer clearfix mr-info-list">
<div class="approvers-prefix">
<p>Approved by</p>
<div class="approvers-list">
<span v-for="approver in approvedBy">
<link-to-member-avatar
:avatarSize="20"
:avatar-url="approver.user.avatar_url"
extra-link-class="approver-avatar"
:display-name="approver.user.name"
:profile-url="approver.user.web_url"
:show-tooltip="true" />
</span>
<span class="potential-approvers-list" v-for="n in approvalsLeft">
<link-to-member-avatar
:avatarSize="20"
:clickable="false"
:show-tooltip="false" />
</span>
<link-to-member-avatar
v-for="(approver, index) in approvedBy"
:key="index"
:avatar-size="20"
:avatar-url="approver.user.avatar_url"
extra-link-class="approver-avatar"
:display-name="approver.user.name"
:profile-url="approver.user.web_url"
:show-tooltip="true"
/>
<link-to-member-avatar
v-for="n in approvalsLeft"
:key="n"
:avatar-size="20"
:clickable="false"
:show-tooltip="false"
/>
</div>
<span class="unapprove-btn-wrap" v-if="showUnapproveButton">
<button
:disabled="unapproving"
@click="unapproveMergeRequest"
class="btn btn-xs">
<i
v-if="unapproving"
class="fa fa-spinner fa-spin"
aria-hidden="true" />
Remove your approval
</button>
</span>
<button
v-if="showUnapproveButton"
type="button"
:disabled="unapproving"
@click="unapproveMergeRequest"
class="btn btn-small unapprove-btn-wrap">
<i
v-if="unapproving"
class="fa fa-spinner fa-spin"
aria-hidden="true">
</i>
Remove your approval
</button>
</div>
</div>
`
,
...
...
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