only include _html fields when asked for

2 files changed, 8 insertions, 7 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index cabbb5c746f..27b4ee83773 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -388,12 +388,6 @@ 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
 
@@ -538,6 +532,12 @@ module API
     end
 
     class MergeRequestBasic < ProjectEntity
+      expose :title_html, if: -> (_, options) { options[:render_html] } do |entity|
+        MarkupHelper::markdown_field(entity, :title)
+      end
+      expose :description_html, if: -> (_, options) { options[:render_html] } do |entity|
+        MarkupHelper::markdown_field(entity, :description)
+      end
       expose :target_branch, :source_branch
       expose :upvotes do |merge_request, options|
         if options[:issuable_metadata]
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 0f46bc4c98e..b42d411022c 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -232,6 +232,7 @@ module API
 
       params do
         requires :merge_request_iid, type: Integer, desc: 'The IID of a merge request'
+        optional :render_html, type: Boolean, desc: 'Returns the description and title rendered html'
       end
       desc 'Get a single merge request' do
         success Entities::MergeRequest
@@ -239,7 +240,7 @@ module API
       get ':id/merge_requests/:merge_request_iid' do
         merge_request = find_merge_request_with_access(params[:merge_request_iid])
 
-        present merge_request, with: Entities::MergeRequest, current_user: current_user, project: user_project
+        present merge_request, with: Entities::MergeRequest, current_user: current_user, project: user_project, render_html: params[:render_html]
       end
 
       desc 'Get the participants of a merge request' do