Add latest changes from gitlab-org/gitlab@master

3 files changed, 68 insertions, 1 deletions

diff --git a/lib/api/entities/commit_with_link.rb b/lib/api/entities/commit_with_link.rb
new file mode 100644
index 00000000000..31a9efed9bc
--- /dev/null
+++ b/lib/api/entities/commit_with_link.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class CommitWithLink < Commit
+      include MarkupHelper
+      include RequestAwareEntity
+
+      expose :author, using: Entities::UserPath
+
+      expose :author_gravatar_url do |commit|
+        GravatarService.new.execute(commit.author_email)
+      end
+
+      expose :commit_url do |commit, options|
+        project_commit_url(request.project, commit, params: options.fetch(:commit_url_params, {}))
+      end
+
+      expose :commit_path do |commit, options|
+        project_commit_path(request.project, commit, params: options.fetch(:commit_url_params, {}))
+      end
+
+      expose :description_html, if: { type: :full } do |commit|
+        markdown_field(commit, :description)
+      end
+
+      expose :title_html, if: { type: :full } do |commit|
+        markdown_field(commit, :title)
+      end
+
+      expose :signature_html, if: { type: :full } do |commit|
+        render('projects/commit/_signature', signature: commit.signature) if commit.has_signature?
+      end
+
+      expose :pipeline_status_path, if: { type: :full } do |commit, options|
+        pipeline_ref = options[:pipeline_ref]
+        pipeline_project = options[:pipeline_project] || commit.project
+        next unless pipeline_ref && pipeline_project
+
+        pipeline = commit.latest_pipeline_for_project(pipeline_ref, pipeline_project)
+        next unless pipeline&.status
+
+        pipelines_project_commit_path(pipeline_project, commit.id, ref: pipeline_ref)
+      end
+
+      def render(*args)
+        return unless request.respond_to?(:render) && request.render.respond_to?(:call)
+
+        request.render.call(*args)
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/user_path.rb b/lib/api/entities/user_path.rb
new file mode 100644
index 00000000000..7d922b39654
--- /dev/null
+++ b/lib/api/entities/user_path.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class UserPath < UserBasic
+      include RequestAwareEntity
+      include UserStatusTooltip
+
+      expose :path do |user|
+        user_path(user)
+      end
+    end
+  end
+end
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 2b1bcc855d2..4d9f035e2cd 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -306,7 +306,7 @@ module API
         context_commits =
           paginate(merge_request.merge_request_context_commits).map(&:to_commit)
 
-        present context_commits, with: Entities::Commit
+        present context_commits, with: Entities::CommitWithLink, type: :full, request: merge_request
       end
 
       params do