diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-08 11:34:22 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-08 11:34:22 +0000 |
| commit | 33fb2f99e92acc96ab322f4594a13f11218db87e (patch) | |
| tree | b0d34a33e47a634c78b03fa0c2aa4667c6f67067 /app/assets/javascripts/groups | |
| parent | 3013951c7318d6b08d83c6ec96a4d68d031c3a62 (diff) | |
| parent | 6185ce0c84b5674abf4f54576fec44fece571565 (diff) | |
| download | gitlab-ce-33fb2f99e92acc96ab322f4594a13f11218db87e.tar.gz | |
Merge branch '40549-render-emoj-in-groups-overview' into 'master'
Resolve "No Rendering of emoji's in Group-Overview after update"
Closes #40549
See merge request gitlab-org/gitlab-ce!16098
Diffstat (limited to 'app/assets/javascripts/groups')
| -rw-r--r-- | app/assets/javascripts/groups/components/group_item.vue | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/groups/store/groups_store.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index 02129d39846..42e79a9e17a 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -141,7 +141,8 @@ export default { <div v-if="group.description" class="description"> - {{group.description}} + <span v-html="group.description"> + </span> </div> </div> <group-folder diff --git a/app/assets/javascripts/groups/store/groups_store.js b/app/assets/javascripts/groups/store/groups_store.js index ffc86175548..4a7569078a1 100644 --- a/app/assets/javascripts/groups/store/groups_store.js +++ b/app/assets/javascripts/groups/store/groups_store.js @@ -71,7 +71,7 @@ export default class GroupsStore { id: rawGroupItem.id, name: rawGroupItem.name, fullName: rawGroupItem.full_name, - description: rawGroupItem.description, + description: rawGroupItem.markdown_description, visibility: rawGroupItem.visibility, avatarUrl: rawGroupItem.avatar_url, relativePath: rawGroupItem.relative_path, |