Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

10 files changed, 26 insertions, 15 deletions

diff --git a/app/serializers/analytics_summary_entity.rb b/app/serializers/analytics_summary_entity.rb
index dc42d7f52ad..a92214d0efa 100644
--- a/app/serializers/analytics_summary_entity.rb
+++ b/app/serializers/analytics_summary_entity.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class AnalyticsSummaryEntity < Grape::Entity
+  expose :identifier
   expose :value, safe: true
   expose :title
   expose :unit, if: { with_unit: true }
diff --git a/app/serializers/codequality_degradation_entity.rb b/app/serializers/codequality_degradation_entity.rb
index be561052507..6289260465b 100644
--- a/app/serializers/codequality_degradation_entity.rb
+++ b/app/serializers/codequality_degradation_entity.rb
@@ -2,7 +2,9 @@
 
 class CodequalityDegradationEntity < Grape::Entity
   expose :description
-  expose :severity
+  expose :severity do |degradation|
+    degradation.dig(:severity)&.downcase
+  end
 
   expose :file_path do |degradation|
     degradation.dig(:location, :path)
diff --git a/app/serializers/environment_serializer.rb b/app/serializers/environment_serializer.rb
index 11445f93609..8d9b73b2290 100644
--- a/app/serializers/environment_serializer.rb
+++ b/app/serializers/environment_serializer.rb
@@ -52,17 +52,13 @@ class EnvironmentSerializer < BaseSerializer
   end
 
   def batch_load(resource)
-    if ::Feature.enabled?(:custom_preloader_for_deployments, default_enabled: :yaml)
-      resource = resource.preload(environment_associations.except(:last_deployment, :upcoming_deployment))
+    resource = resource.preload(environment_associations.except(:last_deployment, :upcoming_deployment))
 
-      Preloaders::Environments::DeploymentPreloader.new(resource)
-        .execute_with_union(:last_deployment, deployment_associations)
+    Preloaders::Environments::DeploymentPreloader.new(resource)
+      .execute_with_union(:last_deployment, deployment_associations)
 
-      Preloaders::Environments::DeploymentPreloader.new(resource)
-        .execute_with_union(:upcoming_deployment, deployment_associations)
-    else
-      resource = resource.preload(environment_associations)
-    end
+    Preloaders::Environments::DeploymentPreloader.new(resource)
+      .execute_with_union(:upcoming_deployment, deployment_associations)
 
     resource.all.to_a.tap do |environments|
       environments.each do |environment|
diff --git a/app/serializers/group_child_entity.rb b/app/serializers/group_child_entity.rb
index c469dbdd6b8..08070c03bf8 100644
--- a/app/serializers/group_child_entity.rb
+++ b/app/serializers/group_child_entity.rb
@@ -58,6 +58,10 @@ class GroupChildEntity < Grape::Entity
     end
   end
 
+  expose :can_remove, unless: lambda { |_instance, _options| project? } do |group|
+    can?(request.current_user, :admin_group, group)
+  end
+
   expose :number_users_with_delimiter, unless: lambda { |_instance, _options| project? } do |instance|
     number_with_delimiter(instance.member_count)
   end
diff --git a/app/serializers/issuable_sidebar_basic_entity.rb b/app/serializers/issuable_sidebar_basic_entity.rb
index 14e416fb71a..b66aad6cc65 100644
--- a/app/serializers/issuable_sidebar_basic_entity.rb
+++ b/app/serializers/issuable_sidebar_basic_entity.rb
@@ -110,6 +110,7 @@ class IssuableSidebarBasicEntity < Grape::Entity
   expose :supports_time_tracking?, as: :supports_time_tracking
   expose :supports_milestone?, as: :supports_milestone
   expose :supports_severity?, as: :supports_severity
+  expose :supports_escalation?, as: :supports_escalation
 
   private
 
diff --git a/app/serializers/issue_sidebar_basic_entity.rb b/app/serializers/issue_sidebar_basic_entity.rb
index f93a42e5f98..9c6601afd5e 100644
--- a/app/serializers/issue_sidebar_basic_entity.rb
+++ b/app/serializers/issue_sidebar_basic_entity.rb
@@ -4,6 +4,12 @@ class IssueSidebarBasicEntity < IssuableSidebarBasicEntity
   expose :due_date
   expose :confidential
   expose :severity
+
+  expose :current_user, merge: true do
+    expose :can_update_escalation_status, if: -> (issue, _) { issue.supports_escalation? } do |issue|
+      can?(current_user, :update_escalation_status, issue.project)
+    end
+  end
 end
 
 IssueSidebarBasicEntity.prepend_mod_with('IssueSidebarBasicEntity')
diff --git a/app/serializers/member_user_entity.rb b/app/serializers/member_user_entity.rb
index 01920fc95bb..fde3282ad25 100644
--- a/app/serializers/member_user_entity.rb
+++ b/app/serializers/member_user_entity.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class MemberUserEntity < UserEntity
-  unexpose :show_status
   unexpose :path
   unexpose :state
   unexpose :status_tooltip_html
diff --git a/app/serializers/merge_request_poll_cached_widget_entity.rb b/app/serializers/merge_request_poll_cached_widget_entity.rb
index 5bf02c93c99..9d001d18aa6 100644
--- a/app/serializers/merge_request_poll_cached_widget_entity.rb
+++ b/app/serializers/merge_request_poll_cached_widget_entity.rb
@@ -8,7 +8,6 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity
   expose :merged_commit_sha
   expose :short_merged_commit_sha
   expose :merge_error
-  expose :public_merge_status, as: :merge_status
   expose :merge_user_id
   expose :source_branch
   expose :source_project_id
@@ -26,6 +25,11 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity
   expose :source_branch_exists?, as: :source_branch_exists
   expose :branch_missing?, as: :branch_missing
 
+  expose :merge_status do |merge_request|
+    merge_request.check_mergeability(async: true)
+    merge_request.public_merge_status
+  end
+
   expose :default_squash_commit_message do |merge_request|
     merge_request.default_squash_commit_message(user: request.current_user)
   end
diff --git a/app/serializers/merge_request_poll_widget_entity.rb b/app/serializers/merge_request_poll_widget_entity.rb
index f68477e82c9..12998d70a22 100644
--- a/app/serializers/merge_request_poll_widget_entity.rb
+++ b/app/serializers/merge_request_poll_widget_entity.rb
@@ -24,8 +24,6 @@ class MergeRequestPollWidgetEntity < Grape::Entity
   end
 
   expose :mergeable do |merge_request, options|
-    next merge_request.mergeable? if Feature.disabled?(:check_mergeability_async_in_widget, merge_request.project, default_enabled: :yaml)
-
     merge_request.mergeable?
   end
 
diff --git a/app/serializers/test_case_entity.rb b/app/serializers/test_case_entity.rb
index 0e64b843fd3..8a5fadf53a6 100644
--- a/app/serializers/test_case_entity.rb
+++ b/app/serializers/test_case_entity.rb
@@ -4,7 +4,7 @@ class TestCaseEntity < Grape::Entity
   include API::Helpers::RelatedResourcesHelpers
 
   expose :status
-  expose :name
+  expose :name, default: "(No name)"
   expose :classname
   expose :file
   expose :execution_time