Merge branch '10905-fix-broken-master' into 'master'

Fix params passed over to PreviewMarkdownService

Closes #10905

See merge request gitlab-org/gitlab-ee!10605

ee/app/controllers/projects/merge_requests/drafts_controller.rb

@@ -103,7 +103,7 @@ class Projects::MergeRequests::DraftsController < Projects::MergeRequests::Appli
   end
 
   def render_draft_note(note)
-    params = { quick_actions_target_id: merge_request.id, quick_actions_target_type: 'MergeRequest', text: note.note }
+    params = { target_id: merge_request.id, target_type: 'MergeRequest', text: note.note }
     result = PreviewMarkdownService.new(@project, current_user, params).execute
     markdown_params = { markdown_engine: result[:markdown_engine], issuable_state_filter_enabled: true }
 

ee/app/serializers/epic_entity.rb

@@ -40,6 +40,6 @@ class EpicEntity < IssuableEntity
   end
 
   expose :preview_note_path do |epic|
-    preview_markdown_path(epic.group, quick_actions_target_type: 'Epic', quick_actions_target_id: epic.id)
+    preview_markdown_path(epic.group, target_type: 'Epic', target_id: epic.id)
   end
 end