diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-06-24 15:27:50 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-06-24 15:27:50 +0000 |
| commit | f53a6d63a4d017912084c4a1f00b4817664e66a5 (patch) | |
| tree | 943e7859bdd98368356b9178afdcdc4d18ec4ba9 | |
| parent | f53b05cfde5aeac73a7c81a2fe951b5642338ae0 (diff) | |
| parent | b574285210706183cf1bbd9ce17268dc03c7ee29 (diff) | |
| download | gitlab-ce-62356-document-and-promote-serviceresponse.tar.gz | |
Merge branch '63559-remove-avatar-from-sign-in' into 'master'62356-document-and-promote-serviceresponse
Resolve "Avatar in "Please sign in" pattern too large"
Closes #63559
See merge request gitlab-org/gitlab-ce!29944
| -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 |