diff options
Diffstat (limited to 'app/services/concerns')
4 files changed, 30 insertions, 8 deletions
diff --git a/app/services/concerns/alert_management/alert_processing.rb b/app/services/concerns/alert_management/alert_processing.rb index 8c6c7b15d28..9fe82507edd 100644 --- a/app/services/concerns/alert_management/alert_processing.rb +++ b/app/services/concerns/alert_management/alert_processing.rb @@ -113,7 +113,7 @@ module AlertManagement end def resolving_alert? - incoming_payload.ends_at.present? + incoming_payload.resolved? end def notifying_alert? @@ -121,7 +121,7 @@ module AlertManagement end def alert_source - incoming_payload.monitoring_tool + incoming_payload.source end def logger diff --git a/app/services/concerns/ci/downstream_pipeline_helpers.rb b/app/services/concerns/ci/downstream_pipeline_helpers.rb index 39c0adb6e4e..26d7eb97151 100644 --- a/app/services/concerns/ci/downstream_pipeline_helpers.rb +++ b/app/services/concerns/ci/downstream_pipeline_helpers.rb @@ -5,7 +5,6 @@ module Ci def log_downstream_pipeline_creation(downstream_pipeline) return unless downstream_pipeline&.persisted? - hierarchy_size = downstream_pipeline.all_pipelines_in_hierarchy.count root_pipeline = downstream_pipeline.upstream_root ::Gitlab::AppLogger.info( @@ -14,7 +13,7 @@ module Ci root_pipeline_id: root_pipeline.id, downstream_pipeline_id: downstream_pipeline.id, downstream_pipeline_relationship: downstream_pipeline.parent_pipeline? ? :parent_child : :multi_project, - hierarchy_size: hierarchy_size, + hierarchy_size: downstream_pipeline.complete_hierarchy_count, root_pipeline_plan: root_pipeline.project.actual_plan_name, root_pipeline_namespace_path: root_pipeline.project.namespace.full_path, root_pipeline_project_path: root_pipeline.project.full_path diff --git a/app/services/concerns/ci/job_token_scope/edit_scope_validations.rb b/app/services/concerns/ci/job_token_scope/edit_scope_validations.rb index 23053975313..427aebf397e 100644 --- a/app/services/concerns/ci/job_token_scope/edit_scope_validations.rb +++ b/app/services/concerns/ci/job_token_scope/edit_scope_validations.rb @@ -9,10 +9,6 @@ module Ci "not exist or you don't have permission to perform this action" def validate_edit!(source_project, target_project, current_user) - unless source_project.ci_job_token_scope_enabled? - raise ValidationError, "Job token scope is disabled for this project" - end - unless can?(current_user, :admin_project, source_project) raise ValidationError, "Insufficient permissions to modify the job token scope" end diff --git a/app/services/concerns/projects/container_repository/gitlab/timeoutable.rb b/app/services/concerns/projects/container_repository/gitlab/timeoutable.rb new file mode 100644 index 00000000000..095f5aa7cfa --- /dev/null +++ b/app/services/concerns/projects/container_repository/gitlab/timeoutable.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +module Projects + module ContainerRepository + module Gitlab + module Timeoutable + extend ActiveSupport::Concern + + DISABLED_TIMEOUTS = [nil, 0].freeze + + TimeoutError = Class.new(StandardError) + + private + + def timeout?(start_time) + return false if service_timeout.in?(DISABLED_TIMEOUTS) + + (Time.zone.now - start_time) > service_timeout + end + + def service_timeout + ::Gitlab::CurrentSettings.current_application_settings.container_registry_delete_tags_service_timeout + end + end + end + end +end |