Add latest changes from gitlab-org/gitlab@master

2 files changed, 43 insertions, 0 deletions

diff --git a/app/serializers/draft_note_entity.rb b/app/serializers/draft_note_entity.rb
new file mode 100644
index 00000000000..cab4849ebc9
--- /dev/null
+++ b/app/serializers/draft_note_entity.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+class DraftNoteEntity < Grape::Entity
+  include RequestAwareEntity
+
+  expose :id
+  expose :author, using: NoteUserEntity
+  expose :merge_request_id
+  expose :position, if: -> (note, _) { note.on_diff? }
+  expose :line_code
+  expose :file_identifier_hash
+  expose :file_hash
+  expose :file_path
+  expose :note
+  expose :rendered_note, as: :note_html
+  expose :references
+  expose :discussion_id
+  expose :resolve_discussion
+  expose :noteable_type
+
+  expose :current_user do
+    expose :can_edit do |note|
+      can?(current_user, :admin_note, note)
+    end
+
+    expose :can_award_emoji do |note|
+      note.emoji_awardable?
+    end
+
+    expose :can_resolve do |note|
+      note.resolvable? && can?(current_user, :resolve_note, note)
+    end
+  end
+
+  private
+
+  def current_user
+    request.current_user
+  end
+end
diff --git a/app/serializers/draft_note_serializer.rb b/app/serializers/draft_note_serializer.rb
new file mode 100644
index 00000000000..282d7f9bdda
--- /dev/null
+++ b/app/serializers/draft_note_serializer.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+class DraftNoteSerializer < BaseSerializer
+  entity DraftNoteEntity
+end