Add latest changes from gitlab-org/gitlab@13-1-stable-ee

2 files changed, 5 insertions, 5 deletions

diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index 6c1f52ec866..935dbfb72dd 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -88,9 +88,11 @@ module Notes
       end
     end
 
-    # EE::Notes::CreateService would override this method
     def quick_action_options
-      { merge_request_diff_head_sha: params[:merge_request_diff_head_sha] }
+      {
+        merge_request_diff_head_sha: params[:merge_request_diff_head_sha],
+        review_id: params[:review_id]
+      }
     end
 
     def tracking_data_for(note)
@@ -103,5 +105,3 @@ module Notes
     end
   end
 end
-
-Notes::CreateService.prepend_if_ee('EE::Notes::CreateService')
diff --git a/app/services/notes/post_process_service.rb b/app/services/notes/post_process_service.rb
index bc86118a150..0e455c641ce 100644
--- a/app/services/notes/post_process_service.rb
+++ b/app/services/notes/post_process_service.rb
@@ -36,7 +36,7 @@ module Notes
       return unless @note.project
 
       note_data = hook_data
-      hooks_scope = @note.confidential? ? :confidential_note_hooks : :note_hooks
+      hooks_scope = @note.confidential?(include_noteable: true) ? :confidential_note_hooks : :note_hooks
 
       @note.project.execute_hooks(note_data, hooks_scope)
       @note.project.execute_services(note_data, hooks_scope)