Merge branch 'develop' into 'fix/timeline-error-handling-fixes'

# Conflicts: # CHANGELOG.md
2020-11-11 20:58:47 +00:00 · 2020-11-11 20:58:47 +00:00 · fb5d3d3292
commit fb5d3d3292
parent 1d2ba946b6 3e1c828ba9
4 changed files with 5 additions and 6 deletions
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@ -20,14 +20,13 @@
          :key="index"
          class="user-profile-field"
        >
+          <!-- eslint-disable vue/no-v-html -->
          <dt
            :title="user.fields_text[index].name"
            class="user-profile-field-name"
            @click.prevent="linkClicked"
-          >
-            {{ field.name }}
-          </dt>
-          <!-- eslint-disable vue/no-v-html -->
+            v-html="field.name"
+          />
          <dd
            :title="user.fields_text[index].value"
            class="user-profile-field-value"