6 files changed, 19 insertions, 13 deletions
diff --git a/app/serializers/admin/abuse_report_details_entity.rb b/app/serializers/admin/abuse_report_details_entity.rb
index 8a67aabda9e..77b85f239f7 100644
--- a/app/serializers/admin/abuse_report_details_entity.rb
+++ b/app/serializers/admin/abuse_report_details_entity.rb
@@ -35,10 +35,7 @@ module Admin
         end
       end
 
-      expose :credit_card, if: ->(report) { report.user.credit_card_validation&.holder_name } do
-        expose :name do |report|
-          report.user.credit_card_validation.holder_name
-        end
+      expose :credit_card, if: ->(report) { report.user.credit_card_validation.present? } do
         expose :similar_records_count do |report|
           report.user.credit_card_validation.similar_records.count
         end
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb
index 741643f7989..9aee031328b 100644
--- a/app/serializers/build_details_entity.rb
+++ b/app/serializers/build_details_entity.rb
@@ -139,10 +139,11 @@ class BuildDetailsEntity < Ci::JobEntity
     return super unless build.failure_reason.to_sym == :missing_dependency_failure
 
     docs_url = "https://docs.gitlab.com/ee/ci/yaml/index.html#dependencies"
+    troubleshooting_url = "https://docs.gitlab.com/ee/ci/jobs/job_artifacts_troubleshooting.html#error-message-this-job-could-not-start-because-it-could-not-retrieve-the-needed-artifacts"
 
     [
       failure_message,
-      help_message(docs_url).html_safe
+      help_message(docs_url, troubleshooting_url).html_safe
     ].join("<br />")
   end
 
@@ -157,8 +158,8 @@ class BuildDetailsEntity < Ci::JobEntity
       { invalid_dependencies: html_escape(invalid_dependencies), punctuation: punctuation }
   end
 
-  def help_message(docs_url)
-    html_escape(_("<a href=\"#{docs_url}\">Learn more.</a>".html_safe))
+  def help_message(docs_url, troubleshooting_url)
+    html_escape(_("Learn more about <a href=\"#{docs_url}\">dependencies</a> and <a href=\"#{troubleshooting_url}\">common causes</a> of this error.</a>".html_safe))
   end
 end
 
diff --git a/app/serializers/ci/pipeline_entity.rb b/app/serializers/ci/pipeline_entity.rb
index 28baa64bc7c..832ca619edc 100644
--- a/app/serializers/ci/pipeline_entity.rb
+++ b/app/serializers/ci/pipeline_entity.rb
@@ -33,7 +33,8 @@ class Ci::PipelineEntity < Grape::Entity
     expose :can_cancel?, as: :cancelable
     expose :failure_reason?, as: :failure_reason
     expose :detached_merge_request_pipeline?, as: :detached_merge_request_pipeline
-    expose :merged_result_pipeline?, as: :merge_request_pipeline
+    expose :merged_result_pipeline?, as: :merge_request_pipeline # deprecated, use merged_result_pipeline going forward
+    expose :merged_result_pipeline?, as: :merged_result_pipeline
   end
 
   expose :details do
@@ -83,12 +84,18 @@ class Ci::PipelineEntity < Grape::Entity
     project_pipeline_path(pipeline.project, pipeline)
   end
 
-  expose :failed_builds, if: -> (*) { can_retry? }, using: Ci::JobEntity do |pipeline|
+  expose :failed_builds,
+    if: -> (_, options) { !options[:disable_failed_builds] && can_retry? },
+    using: Ci::JobEntity do |pipeline|
     pipeline.failed_builds.each do |build|
       build.project = pipeline.project
     end
   end
 
+  expose :failed_builds_count do |pipeline|
+    pipeline.failed_builds.size
+  end
+
   private
 
   alias_method :pipeline, :object
diff --git a/app/serializers/merge_request_noteable_entity.rb b/app/serializers/merge_request_noteable_entity.rb
index 306bac7daae..aac90c20b53 100644
--- a/app/serializers/merge_request_noteable_entity.rb
+++ b/app/serializers/merge_request_noteable_entity.rb
@@ -15,8 +15,8 @@ class MergeRequestNoteableEntity < IssuableEntity
     project_tree_path(merge_request.source_project, merge_request.source_branch)
   end
 
-  expose :target_branch_path, if: -> (merge_request) { merge_request.source_project } do |merge_request|
-    project_tree_path(merge_request.source_project, merge_request.target_branch)
+  expose :target_branch_path, if: -> (merge_request) { merge_request.target_project } do |merge_request|
+    project_tree_path(merge_request.target_project, merge_request.target_branch)
   end
 
   expose :diff_head_sha
diff --git a/app/serializers/merge_requests/pipeline_entity.rb b/app/serializers/merge_requests/pipeline_entity.rb
index 500dc435526..83f168682db 100644
--- a/app/serializers/merge_requests/pipeline_entity.rb
+++ b/app/serializers/merge_requests/pipeline_entity.rb
@@ -12,7 +12,8 @@ class MergeRequests::PipelineEntity < Grape::Entity
   end
 
   expose :flags do
-    expose :merged_result_pipeline?, as: :merge_request_pipeline
+    expose :merged_result_pipeline?, as: :merge_request_pipeline # deprecated, use merged_result_pipeline going forward
+    expose :merged_result_pipeline?, as: :merged_result_pipeline
   end
 
   expose :commit, using: CommitEntity
diff --git a/app/serializers/project_import_entity.rb b/app/serializers/project_import_entity.rb
index 302086143c1..e5d1b84b7e4 100644
--- a/app/serializers/project_import_entity.rb
+++ b/app/serializers/project_import_entity.rb
@@ -19,7 +19,7 @@ class ProjectImportEntity < ProjectEntity
 
   # Only for GitHub importer where we pass client through
   expose :relation_type do |project, options|
-    next nil if options[:client].nil? || Feature.disabled?(:remove_legacy_github_client)
+    next nil if options[:client].nil?
 
     ::Gitlab::GithubImport::ProjectRelationType.new(options[:client]).for(project.import_source)
   end