diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-30 09:08:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-30 09:08:47 +0000 |
| commit | 4381702a8509383c7158a4d89a0ed187532604f2 (patch) | |
| tree | c5f68f7f5791974debda374611410c189740575c /app/assets/javascripts/notes | |
| parent | a56c206075c757ef6ecd5a5a3803d5e03379d369 (diff) | |
| download | gitlab-ce-4381702a8509383c7158a4d89a0ed187532604f2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/toggle_replies_widget.vue | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/toggle_replies_widget.vue b/app/assets/javascripts/notes/components/toggle_replies_widget.vue index 734e08dd586..4437d461308 100644 --- a/app/assets/javascripts/notes/components/toggle_replies_widget.vue +++ b/app/assets/javascripts/notes/components/toggle_replies_widget.vue @@ -79,7 +79,7 @@ export default { :link-href="author.path" :img-alt="author.name" img-css-classes="gl-mr-0!" - :img-src="author.avatar_url" + :img-src="author.avatar_url || author.avatarUrl" :img-size="24" :tooltip-text="author.name" tooltip-placement="bottom" @@ -102,7 +102,10 @@ export default { </gl-link> </template> </gl-sprintf> - <time-ago-tooltip :time="lastReply.created_at" tooltip-placement="bottom" /> + <time-ago-tooltip + :time="lastReply.created_at || lastReply.createdAt" + tooltip-placement="bottom" + /> </template> <gl-button v-else |