From 6021ab6f779c81fa84ef042a66573c232cd74def Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 2 Jul 2018 10:38:03 +0100
Subject: added html to response

---
 app/assets/javascripts/ide/components/merge_requests/info.vue | 4 ++--
 lib/api/entities.rb                                           | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/ide/components/merge_requests/info.vue b/app/assets/javascripts/ide/components/merge_requests/info.vue
index 05a2d1a0ccd..b146aea4f45 100644
--- a/app/assets/javascripts/ide/components/merge_requests/info.vue
+++ b/app/assets/javascripts/ide/components/merge_requests/info.vue
@@ -53,11 +53,11 @@ export default {
     <div class="issuable-details">
       <title-component
         :issuable-ref="currentMergeRequest.iid"
-        :title-html="currentMergeRequest.title"
+        :title-html="currentMergeRequest.title_html"
         :title-text="currentMergeRequest.title"
       />
       <description-component
-        :description-html="currentMergeRequest.description"
+        :description-html="currentMergeRequest.description_html"
         :description-text="currentMergeRequest.description"
         :can-update="false"
       />
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 3a6e707fd5b..cabbb5c746f 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -388,6 +388,12 @@ module API
       expose :id, :iid
       expose(:project_id) { |entity| entity&.project.try(:id) }
       expose :title, :description
+      expose :title_html do |entity|
+        MarkupHelper::markdown_field(entity, :title)
+      end
+      expose :description_html do |entity|
+        MarkupHelper::markdown_field(entity, :description)
+      end
       expose :state, :created_at, :updated_at
     end
 
-- 
cgit v1.2.3