diff --git a/.github/workflows/check-pull-request-labels.yaml b/.github/workflows/check-pull-request-labels.yaml index 16bdfe0a521..10f4175e31e 100644 --- a/.github/workflows/check-pull-request-labels.yaml +++ b/.github/workflows/check-pull-request-labels.yaml @@ -30,6 +30,7 @@ jobs: 'comp:', 'inst:', 'tag:', + 'mergequeue-status:', 'performance:', // To refactor to 'ci: ' in the future 'run-tests:' // Unused since GitLab migration ] diff --git a/repository.datadog.yaml b/repository.datadog.yaml index ded5018823b..8d5c98b060a 100644 --- a/repository.datadog.yaml +++ b/repository.datadog.yaml @@ -1,4 +1,9 @@ --- schema-version: v1 -kind: mergequeue -enable: false +kind: mergequeue # https://datadoghq.atlassian.net/wiki/x/XgUQug +enable: true +merge_method: squash +branches: + master: + allow_skip_checks: true + require_reason_for_skip_checks: true