diff options
| author | Jacopo <beschi.jacopo@gmail.com> | 2017-12-21 22:15:50 +0100 |
|---|---|---|
| committer | Jacopo <beschi.jacopo@gmail.com> | 2017-12-24 12:14:17 +0100 |
| commit | 6185ce0c84b5674abf4f54576fec44fece571565 (patch) | |
| tree | 2c2a3bf90a4beb10628477bc22b37c9c7d056202 /app | |
| parent | 2972352a9c6912adfd77b480472eb13b832a6c3b (diff) | |
| download | gitlab-ce-6185ce0c84b5674abf4f54576fec44fece571565.tar.gz | |
Rendering of emoji's in Group-Overview
Allows rendering of emoji's in the Group Overview.
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/groups/components/group_item.vue | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/groups/store/groups_store.js | 2 | ||||
| -rw-r--r-- | app/serializers/group_child_entity.rb | 9 |
3 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index 6421547bbde..ad01c261b7f 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -139,7 +139,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 a1689f4c5cc..cbb7ec57e34 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, diff --git a/app/serializers/group_child_entity.rb b/app/serializers/group_child_entity.rb index 37240bfb0b1..aca4e4ca488 100644 --- a/app/serializers/group_child_entity.rb +++ b/app/serializers/group_child_entity.rb @@ -1,6 +1,7 @@ class GroupChildEntity < Grape::Entity include ActionView::Helpers::NumberHelper include RequestAwareEntity + include MarkupHelper expose :id, :name, :description, :visibility, :full_name, :created_at, :updated_at, :avatar_url @@ -59,6 +60,10 @@ class GroupChildEntity < Grape::Entity number_with_delimiter(instance.member_count) end + expose :markdown_description do |instance| + markdown_description + end + private def membership @@ -74,4 +79,8 @@ class GroupChildEntity < Grape::Entity def type object.class.name.downcase end + + def markdown_description + markdown_field(object, :description) + end end |