diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-12-17 10:24:14 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-12-17 10:24:14 +0000 |
| commit | dac38419fe723ae9e327afe1fa5aab4c61aebb98 (patch) | |
| tree | 5a1b13075d7548835524725d599d24ad38db87e3 /app/assets | |
| parent | 5afbeaad3bdd7e66faf12c78ca87d09f79025bb1 (diff) | |
| parent | 3c3701c97e49eb335db78248fc88daa5a4a85918 (diff) | |
| download | gitlab-ce-dac38419fe723ae9e327afe1fa5aab4c61aebb98.tar.gz | |
Merge branch '55276-encoding-issue-with-the-user-centric-tooltips' into 'master'
Resolve "Encoding issue with the user centric tooltips"
Closes #55276
See merge request gitlab-org/gitlab-ce!23794
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue index 7fbadcc0111..fad1a2f3f56 100644 --- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue +++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue @@ -30,10 +30,14 @@ export default { computed: { jobLine() { if (this.user.bio && this.user.organization) { - return sprintf(__('%{bio} at %{organization}'), { - bio: this.user.bio, - organization: this.user.organization, - }); + return sprintf( + __('%{bio} at %{organization}'), + { + bio: this.user.bio, + organization: this.user.organization, + }, + false, + ); } else if (this.user.bio) { return this.user.bio; } else if (this.user.organization) { |