diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-08-01 15:21:24 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-01 15:21:24 +0000 |
| commit | 83a0db0c551236518bdec1a7ae3a1ed1d05f5aaa (patch) | |
| tree | e13ad022ea223e7bde5202a31ee81169225fec99 /app/assets/javascripts/vue_shared/components | |
| parent | ea6fc714bb0306ac8ca56b5dafe4b6777aafe5fc (diff) | |
| parent | 12095251c3777c5231cab97854d5dca69d31cc5d (diff) | |
| download | gitlab-ce-83a0db0c551236518bdec1a7ae3a1ed1d05f5aaa.tar.gz | |
Merge branch 'bvl-user-status-message-35463' into 'master'
Allow users to set a status
Closes #35463
See merge request gitlab-org/gitlab-ce!20614
Diffstat (limited to 'app/assets/javascripts/vue_shared/components')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/header_ci_component.vue | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_shared/components/header_ci_component.vue b/app/assets/javascripts/vue_shared/components/header_ci_component.vue index 62d35f6547d..49fbce75110 100644 --- a/app/assets/javascripts/vue_shared/components/header_ci_component.vue +++ b/app/assets/javascripts/vue_shared/components/header_ci_component.vue @@ -113,6 +113,9 @@ export default { {{ user.name }} </a> + <span + v-if="user.status_tooltip_html" + v-html="user.status_tooltip_html"></span> </template> </section> |