Add latest changes from gitlab-org/gitlab@master

3 files changed, 22 insertions, 4 deletions

diff --git a/app/graphql/resolvers/project_merge_requests_resolver.rb b/app/graphql/resolvers/project_merge_requests_resolver.rb
index 934f07f7d9f..9628a6dfd7a 100644
--- a/app/graphql/resolvers/project_merge_requests_resolver.rb
+++ b/app/graphql/resolvers/project_merge_requests_resolver.rb
@@ -10,7 +10,7 @@ module Resolvers
     def resolve(**args)
       scope = super
 
-      if only_count_is_selected_with_merged_at_filter?(args) && Feature.enabled?(:optimized_merge_request_count_with_merged_at_filter)
+      if only_count_is_selected_with_merged_at_filter?(args) && Feature.enabled?(:optimized_merge_request_count_with_merged_at_filter, default_enabled: :yaml)
         MergeRequest::MetricsFinder
           .new(current_user, args.merge(target_project: project))
           .execute
diff --git a/app/helpers/analytics/cycle_analytics_helper.rb b/app/helpers/analytics/cycle_analytics_helper.rb
new file mode 100644
index 00000000000..c43ac545bf8
--- /dev/null
+++ b/app/helpers/analytics/cycle_analytics_helper.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Analytics
+  module CycleAnalyticsHelper
+    def cycle_analytics_default_stage_config
+      Gitlab::Analytics::CycleAnalytics::DefaultStages.all.map do |stage_params|
+        Analytics::CycleAnalytics::StagePresenter.new(stage_params)
+      end
+    end
+  end
+end
diff --git a/app/services/container_expiration_policies/cleanup_service.rb b/app/services/container_expiration_policies/cleanup_service.rb
index b9e623e2e07..83a4d422a4f 100644
--- a/app/services/container_expiration_policies/cleanup_service.rb
+++ b/app/services/container_expiration_policies/cleanup_service.rb
@@ -15,9 +15,15 @@ module ContainerExpirationPolicies
 
       repository.start_expiration_policy!
 
-      service_result = Projects::ContainerRepository::CleanupTagsService
-        .new(project, nil, policy_params.merge('container_expiration_policy' => true))
-        .execute(repository)
+      begin
+        service_result = Projects::ContainerRepository::CleanupTagsService
+                           .new(project, nil, policy_params.merge('container_expiration_policy' => true))
+                           .execute(repository)
+      rescue
+        repository.cleanup_unfinished!
+
+        raise
+      end
 
       if service_result[:status] == :success
         repository.update!(
@@ -25,6 +31,7 @@ module ContainerExpirationPolicies
           expiration_policy_started_at: nil,
           expiration_policy_completed_at: Time.zone.now
         )
+
         success(:finished, service_result)
       else
         repository.cleanup_unfinished!