diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-23 06:07:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-23 06:07:43 +0300 |
| commit | 0fb62bd3e1df8e54a58382f177edc15926b6b861 (patch) | |
| tree | 30d7cdd49a08aa4ff54bf615072746e36a7ab2ad /config | |
| parent | ec8587780b41c8a895f2b26d60c86bf93be5e038 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/ci_workflow_rules_variables.yml | 8 | ||||
| -rw-r--r-- | config/initializers/7_redis.rb | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/config/feature_flags/development/ci_workflow_rules_variables.yml b/config/feature_flags/development/ci_workflow_rules_variables.yml deleted file mode 100644 index 427a07c51f6..00000000000 --- a/config/feature_flags/development/ci_workflow_rules_variables.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ci_workflow_rules_variables -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52085 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300997 -milestone: '13.11' -type: development -group: group::pipeline authoring -default_enabled: true diff --git a/config/initializers/7_redis.rb b/config/initializers/7_redis.rb index fe37dfd7579..84aa231089b 100644 --- a/config/initializers/7_redis.rb +++ b/config/initializers/7_redis.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +Redis::Client.prepend(Gitlab::Instrumentation::RedisInterceptor) + # Make sure we initialize a Redis connection pool before multi-threaded # execution starts by # 1. Sidekiq |