diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-12-17 10:24:14 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-12-18 19:39:57 +0000 |
| commit | e27a1d9151c414a1771d495a1fd6df6e01ba8f31 (patch) | |
| tree | 33a7aa09ae121c778aec0204922152c68f032804 /app | |
| parent | 78266bb05838a6609e19e8ab8fb60b48a675c0c8 (diff) | |
| download | gitlab-ce-e27a1d9151c414a1771d495a1fd6df6e01ba8f31.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
(cherry picked from commit dac38419fe723ae9e327afe1fa5aab4c61aebb98)
421b3a15 Prevent escaping in user tooltip
db30ddbf Pretty print user-popover.vue
3c3701c9 Add a test for special characters
Diffstat (limited to 'app')
| -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) { |