diff options
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/ci/templates/Security/DAST.latest.gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | lib/gitlab/project_stats_refresh_conflicts_logger.rb | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lib/gitlab/ci/templates/Security/DAST.latest.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/DAST.latest.gitlab-ci.yml index e5ac5099546..10549b56856 100644 --- a/lib/gitlab/ci/templates/Security/DAST.latest.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/DAST.latest.gitlab-ci.yml @@ -48,13 +48,10 @@ dast: $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME when: never - if: $CI_DEFAULT_BRANCH != $CI_COMMIT_REF_NAME && - $REVIEW_DISABLED && $DAST_WEBSITE == null && - $DAST_API_SPECIFICATION == null + $REVIEW_DISABLED when: never - if: $CI_COMMIT_BRANCH && ($CI_KUBERNETES_ACTIVE || $KUBECONFIG) && $GITLAB_FEATURES =~ /\bdast\b/ - if: $CI_COMMIT_BRANCH && - $DAST_WEBSITE - - if: $CI_COMMIT_BRANCH && - $DAST_API_SPECIFICATION + $GITLAB_FEATURES =~ /\bdast\b/ diff --git a/lib/gitlab/project_stats_refresh_conflicts_logger.rb b/lib/gitlab/project_stats_refresh_conflicts_logger.rb index 49f5a544a87..3e7eecce89c 100644 --- a/lib/gitlab/project_stats_refresh_conflicts_logger.rb +++ b/lib/gitlab/project_stats_refresh_conflicts_logger.rb @@ -20,5 +20,15 @@ module Gitlab Gitlab::AppLogger.warn(payload) end + + def self.warn_skipped_artifact_deletion_during_stats_refresh(project_ids:, method:) + payload = Gitlab::ApplicationContext.current.merge( + message: 'Skipped deleting artifacts undergoing refresh', + method: method, + project_ids: project_ids + ) + + Gitlab::AppLogger.warn(payload) + end end end |