diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
| commit | e4384360a16dd9a19d4d2d25d0ef1f2b862ed2a6 (patch) | |
| tree | 2fcdfa7dcdb9db8f5208b2562f4b4e803d671243 /sidekiq_cluster | |
| parent | ffda4e7bcac36987f936b4ba515995a6698698f0 (diff) | |
Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42
Diffstat (limited to 'sidekiq_cluster')
| -rw-r--r-- | sidekiq_cluster/cli.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sidekiq_cluster/cli.rb b/sidekiq_cluster/cli.rb index 22cddead3e4..fc065d799d4 100644 --- a/sidekiq_cluster/cli.rb +++ b/sidekiq_cluster/cli.rb @@ -5,11 +5,11 @@ require_relative '../config/bundler_setup' require 'optparse' require 'logger' require 'time' +require 'gitlab/utils/all' # In environments where code is preloaded and cached such as `spring`, # we may run into "already initialized" warnings, hence the check. -require_relative '../lib/gitlab' unless Object.const_defined?(:Gitlab) -require_relative '../lib/gitlab/utils' +require_relative '../lib/gitlab' require_relative '../lib/gitlab/sidekiq_config/cli_methods' require_relative '../lib/gitlab/sidekiq_config/worker_matcher' require_relative '../lib/gitlab/sidekiq_logging/json_formatter' |