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
74dc0c18
Commit
74dc0c18
authored
5 years ago
by
Gokhan Apaydin
Committed by
Tim Zallmann
5 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix display comment avatars issue in IE 11
parent
870a18e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
...s/vue_shared/components/user_avatar/user_avatar_image.vue
+2
-1
changelogs/unreleased/patch-38.yml
changelogs/unreleased/patch-38.yml
+5
-0
No files found.
app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
View file @
74dc0c18
...
@@ -68,7 +68,8 @@ export default {
...
@@ -68,7 +68,8 @@ export default {
sanitizedSource
()
{
sanitizedSource
()
{
let
baseSrc
=
this
.
imgSrc
===
''
||
this
.
imgSrc
===
null
?
defaultAvatarUrl
:
this
.
imgSrc
;
let
baseSrc
=
this
.
imgSrc
===
''
||
this
.
imgSrc
===
null
?
defaultAvatarUrl
:
this
.
imgSrc
;
// Only adds the width to the URL if its not a base64 data image
// Only adds the width to the URL if its not a base64 data image
if
(
!
baseSrc
.
startsWith
(
'
data:
'
)
&&
!
baseSrc
.
includes
(
'
?
'
))
baseSrc
+=
`?width=
${
this
.
size
}
`
;
if
(
!
(
baseSrc
.
indexOf
(
'
data:
'
)
===
0
)
&&
!
baseSrc
.
includes
(
'
?
'
))
baseSrc
+=
`?width=
${
this
.
size
}
`
;
return
baseSrc
;
return
baseSrc
;
},
},
resultantSrcAttribute
()
{
resultantSrcAttribute
()
{
...
...
This diff is collapsed.
Click to expand it.
changelogs/unreleased/patch-38.yml
0 → 100644
View file @
74dc0c18
---
title
:
fix display comment avatars issue in IE
11
merge_request
:
24777
author
:
Gokhan Apaydin
type
:
fixed
This diff is collapsed.
Click to expand it.
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