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
976ab80a
Commit
976ab80a
authored
Jun 05, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
readd avatar url to approver avatar
parent
27a8cc7b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
0 deletions
+17
-0
app/assets/javascripts/vue_merge_request_widget/ee/components/approvals/approvals_footer.js
...equest_widget/ee/components/approvals/approvals_footer.js
+1
-0
spec/javascripts/approvals/approvals_footer_spec.js
spec/javascripts/approvals/approvals_footer_spec.js
+16
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/ee/components/approvals/approvals_footer.js
View file @
976ab80a
...
...
@@ -72,6 +72,7 @@ export default {
<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"
...
...
spec/javascripts/approvals/approvals_footer_spec.js
View file @
976ab80a
...
...
@@ -71,5 +71,21 @@ import ApprovalsFooter from '~/vue_merge_request_widget/ee/components/approvals/
});
});
});
describe
(
'
approvers list
'
,
function
()
{
it
(
'
shows link to member avatar for for each approver
'
,
function
(
done
)
{
this
.
approvalsFooter
.
approvedBy
.
push
({
user
:
{
avatar_url
:
'
/dummy.jpg
'
,
},
});
Vue
.
nextTick
(()
=>
{
const
memberImage
=
document
.
querySelector
(
'
.approvers-list img
'
);
expect
(
memberImage
.
src
).
toMatch
(
/dummy
\.
jpg$/
);
done
();
});
});
});
});
})(
window
.
gl
||
(
window
.
gl
=
{}));
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