diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-10 15:09:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-10 15:09:27 +0300 |
| commit | 43d1fef975a24dcaac3ad9bbf20ae9839f5ec9ed (patch) | |
| tree | 7b68a14e21158abeffebd40f32ca840aa55e6d77 /rubocop | |
| parent | 19a36e759b6ba949c5e37e6e40e9f1a230106aa0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'rubocop')
| -rw-r--r-- | rubocop/cop/gitlab/mark_used_feature_flags.rb | 11 | ||||
| -rw-r--r-- | rubocop/rubocop-code_reuse.yml | 1 |
2 files changed, 3 insertions, 9 deletions
diff --git a/rubocop/cop/gitlab/mark_used_feature_flags.rb b/rubocop/cop/gitlab/mark_used_feature_flags.rb index 65a1731fc28..4c6cc6c6778 100644 --- a/rubocop/cop/gitlab/mark_used_feature_flags.rb +++ b/rubocop/cop/gitlab/mark_used_feature_flags.rb @@ -16,9 +16,6 @@ module RuboCop EXPERIMENT_METHODS = %i[ experiment ].freeze - RUGGED_METHODS = %i[ - use_rugged? - ].freeze WORKER_METHODS = %i[ data_consistency deduplicate @@ -28,7 +25,7 @@ module RuboCop push_force_frontend_feature_flag limit_feature_flag= limit_feature_flag_for_override= - ].freeze + EXPERIMENT_METHODS + RUGGED_METHODS + WORKER_METHODS + ].freeze + EXPERIMENT_METHODS + WORKER_METHODS RESTRICT_ON_SEND = FEATURE_METHODS + SELF_METHODS @@ -119,7 +116,7 @@ module RuboCop pair.key.value == :feature_flag end&.value else - arg_index = rugged_method?(node) ? 3 : 2 + arg_index = 2 node.children[arg_index] end @@ -156,10 +153,6 @@ module RuboCop class_caller(node) == "Feature::Gitaly" end - def rugged_method?(node) - RUGGED_METHODS.include?(method_name(node)) - end - def feature_method?(node) FEATURE_METHODS.include?(method_name(node)) && (caller_is_feature?(node) || caller_is_feature_gitaly?(node)) end diff --git a/rubocop/rubocop-code_reuse.yml b/rubocop/rubocop-code_reuse.yml index f96de5caf99..2bd3339368d 100644 --- a/rubocop/rubocop-code_reuse.yml +++ b/rubocop/rubocop-code_reuse.yml @@ -24,6 +24,7 @@ CodeReuse/ActiveRecord: - danger/**/*.rb - lib/backup/**/*.rb - lib/banzai/**/*.rb + - lib/click_house/migration_support/**/*.rb - lib/gitlab/background_migration/**/*.rb - lib/gitlab/cycle_analytics/**/*.rb - lib/gitlab/counters/**/*.rb |