diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-16 09:12:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-16 09:12:45 +0300 |
| commit | 3e4c70d0708bdbf27edf4bbd3f01b85a921f759e (patch) | |
| tree | 58b55a16c96d6f044a5a75253fdf7bce8ab3ee57 /config | |
| parent | 555976016b899c8507cd58196e6c9f647fa6b19e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/always_set_pipeline_failure_reason.yml | 8 | ||||
| -rw-r--r-- | config/initializers/7_redis.rb | 2 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/config/feature_flags/development/always_set_pipeline_failure_reason.yml b/config/feature_flags/development/always_set_pipeline_failure_reason.yml new file mode 100644 index 00000000000..fad54828280 --- /dev/null +++ b/config/feature_flags/development/always_set_pipeline_failure_reason.yml @@ -0,0 +1,8 @@ +--- +name: always_set_pipeline_failure_reason +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138390 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434228 +milestone: '16.7' +type: development +group: group::pipeline execution +default_enabled: false diff --git a/config/initializers/7_redis.rb b/config/initializers/7_redis.rb index 64aee6f760d..040257535f8 100644 --- a/config/initializers/7_redis.rb +++ b/config/initializers/7_redis.rb @@ -39,5 +39,5 @@ end # 2. Rails.cache # 3. HTTP clients Gitlab::Redis::ALL_CLASSES.each do |redis_instance| - redis_instance.with { nil } + redis_instance.with { nil } unless redis_instance == Gitlab::Redis::ClusterSharedState end diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index d10dd1528ea..7af1f3422e8 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -171,6 +171,8 @@ - 1 - - ci_parse_secure_file_metadata - 1 +- - ci_runners_export_usage_csv + - 1 - - ci_runners_process_runner_version_update - 1 - - ci_unlock_pipelines_in_queue |