diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
| commit | 419c53ec62de6e97a517abd5fdd4cbde3a942a34 (patch) | |
| tree | 1f43a548b46bca8a5fb8fe0c31cef1883d49c5b6 /lib/gitlab/workhorse.rb | |
| parent | 1da20d9135b3ad9e75e65b028bffc921aaf8deb7 (diff) | |
Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42
Diffstat (limited to 'lib/gitlab/workhorse.rb')
| -rw-r--r-- | lib/gitlab/workhorse.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index d19dd6cd856..f2db7e3c9b9 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -260,12 +260,7 @@ module Gitlab protected def with_redis(&blk) - if Feature.enabled?(:use_primary_and_secondary_stores_for_workhorse) || - Feature.enabled?(:use_primary_store_as_default_for_workhorse) - Gitlab::Redis::Workhorse.with(&blk) # rubocop:disable CodeReuse/ActiveRecord - else - Gitlab::Redis::SharedState.with(&blk) # rubocop:disable CodeReuse/ActiveRecord - end + Gitlab::Redis::Workhorse.with(&blk) # rubocop:disable CodeReuse/ActiveRecord end # This is the outermost encoding of a senddata: header. It is safe for |