summaryrefslogtreecommitdiff
path: root/rubocop
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-02-15 12:07:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-15 12:07:58 +0000
commitf26f31d2fd8e3c91677e2629293b9e0562c1437a (patch)
tree5a689004863bee4374c16920663221ea81afe664 /rubocop
parent50e177d19bdeeb0fcc7b129b9c30841454df240b (diff)
downloadgitlab-ce-f26f31d2fd8e3c91677e2629293b9e0562c1437a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'rubocop')
-rw-r--r--rubocop/cop/database/multiple_databases.rb1
-rw-r--r--rubocop/cop/sidekiq_load_balancing/worker_data_consistency.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/rubocop/cop/database/multiple_databases.rb b/rubocop/cop/database/multiple_databases.rb
index 26beecdeba7..eccb4a78219 100644
--- a/rubocop/cop/database/multiple_databases.rb
+++ b/rubocop/cop/database/multiple_databases.rb
@@ -20,6 +20,7 @@ module RuboCop
ALLOWED_METHODS = %i[
no_touching
configurations
+ connection_handler
logger
].freeze
diff --git a/rubocop/cop/sidekiq_load_balancing/worker_data_consistency.rb b/rubocop/cop/sidekiq_load_balancing/worker_data_consistency.rb
index 34c3767ad11..7fe308d6b40 100644
--- a/rubocop/cop/sidekiq_load_balancing/worker_data_consistency.rb
+++ b/rubocop/cop/sidekiq_load_balancing/worker_data_consistency.rb
@@ -26,7 +26,7 @@ module RuboCop
class WorkerDataConsistency < RuboCop::Cop::Base
include CodeReuseHelpers
- HELP_LINK = 'https://docs.gitlab.com/ee/development/sidekiq_style_guide.html#job-data-consistency-strategies'
+ HELP_LINK = 'https://docs.gitlab.com/ee/development/sidekiq/worker_attributes.html#job-data-consistency-strategies'
MSG = <<~MSG
Should define data_consistency expectation.