diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-30 21:09:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-30 21:09:46 +0300 |
| commit | ace0df53d3ed38344b470727d430484d24eeb798 (patch) | |
| tree | ec1fc71d793bf3d588df9fe97c4649c87e697e73 /app/assets/javascripts/notes | |
| parent | 56eafa995d0bbda39bc24cd07537286bf36a4dd9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/note_header.vue | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue index 064b3d05cc0..17a995018d3 100644 --- a/app/assets/javascripts/notes/components/note_header.vue +++ b/app/assets/javascripts/notes/components/note_header.vue @@ -85,7 +85,10 @@ export default { }; }, authorStatus() { - return this.author.status_tooltip_html; + if (this.author?.show_status) { + return this.author.status_tooltip_html; + } + return false; }, authorIsBusy() { const { status } = this.author; |