diff options
| author | Marcel van Remmerden <mvanremmerden@gitlab.com> | 2019-06-21 13:36:51 -0500 |
|---|---|---|
| committer | Marcel van Remmerden <mvanremmerden@gitlab.com> | 2019-06-21 13:59:01 -0500 |
| commit | c90e4b1793d6467b67eee5b547e7b11f39d343bf (patch) | |
| tree | e4e16ed6aec7ea4b46827360984b01157275b3d5 | |
| parent | 76f49de4e772c4101bcb8df801ad9b7a78adcea7 (diff) | |
| download | gitlab-ce-63559-remove-avatar-from-sign-in.tar.gz | |
Switch from currentUser to userCanReply63559-remove-avatar-from-sign-in
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_discussion.vue | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/63559-remove-avatar-from-sign-in.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index eb6a4a67fff..10b15a9c38c 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -382,7 +382,7 @@ Please check your network connection and try again.`; class="discussion-reply-holder" > <user-avatar-link - v-if="!isReplying && currentUser" + v-if="!isReplying && userCanReply" :link-href="currentUser.path" :img-src="currentUser.avatar_url" :img-alt="currentUser.name" diff --git a/changelogs/unreleased/63559-remove-avatar-from-sign-in.yml b/changelogs/unreleased/63559-remove-avatar-from-sign-in.yml new file mode 100644 index 00000000000..3f7a8e19de5 --- /dev/null +++ b/changelogs/unreleased/63559-remove-avatar-from-sign-in.yml @@ -0,0 +1,5 @@ +--- +title: Resolve Avatar in Please sign in pattern too large +merge_request: 29944 +author: +type: fixed |