Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 53 deletions

diff --git a/app/serializers/commit_entity.rb b/app/serializers/commit_entity.rb
index ae3f1c6bbf5..c9c4981682a 100644
--- a/app/serializers/commit_entity.rb
+++ b/app/serializers/commit_entity.rb
@@ -1,49 +1,4 @@
 # frozen_string_literal: true
 
-class CommitEntity < API::Entities::Commit
-  include MarkupHelper
-  include RequestAwareEntity
-
-  expose :author, using: UserEntity
-
-  expose :author_gravatar_url do |commit|
-    GravatarService.new.execute(commit.author_email) # rubocop: disable CodeReuse/ServiceClass
-  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
+class CommitEntity < API::Entities::CommitWithLink
 end
diff --git a/app/serializers/user_entity.rb b/app/serializers/user_entity.rb
index 656900bb8af..8909ae8df2c 100644
--- a/app/serializers/user_entity.rb
+++ b/app/serializers/user_entity.rb
@@ -1,10 +1,4 @@
 # frozen_string_literal: true
 
-class UserEntity < API::Entities::UserBasic
-  include RequestAwareEntity
-  include UserStatusTooltip
-
-  expose :path do |user|
-    user_path(user)
-  end
+class UserEntity < API::Entities::UserPath
 end