diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-27 06:09:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-27 06:09:18 +0300 |
| commit | 0e1350d51ca2135e37743dfb7af98eae43c72892 (patch) | |
| tree | 10a5c3f27cebc539b5b8fe42d4907aec767949b1 /rubocop | |
| parent | 417ef56d244c6c22016fda7c78e69071d14887c3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'rubocop')
| -rw-r--r-- | rubocop/cop/gitlab/mark_used_feature_flags.rb | 2 | ||||
| -rw-r--r-- | rubocop/cop/graphql/authorize_types.rb | 2 | ||||
| -rw-r--r-- | rubocop/rubocop-code_reuse.yml | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/rubocop/cop/gitlab/mark_used_feature_flags.rb b/rubocop/cop/gitlab/mark_used_feature_flags.rb index f466ab87aa0..65a1731fc28 100644 --- a/rubocop/cop/gitlab/mark_used_feature_flags.rb +++ b/rubocop/cop/gitlab/mark_used_feature_flags.rb @@ -173,7 +173,7 @@ module RuboCop end def trackable_flag?(node) - feature_method?(node) || self_method?(node) + feature_method?(node) || self_method?(node) || worker_method?(node) end def defined_feature_flags diff --git a/rubocop/cop/graphql/authorize_types.rb b/rubocop/cop/graphql/authorize_types.rb index 7bd2cd9f7ef..db79a4732d9 100644 --- a/rubocop/cop/graphql/authorize_types.rb +++ b/rubocop/cop/graphql/authorize_types.rb @@ -12,7 +12,7 @@ module RuboCop QueryType GraphQL::Schema BaseUnion BaseInputObject].freeze def_node_search :authorize?, <<~PATTERN - (send nil? :authorize ...) + (send nil? :authorize sym+) PATTERN def on_class(node) diff --git a/rubocop/rubocop-code_reuse.yml b/rubocop/rubocop-code_reuse.yml index 6d54f880759..c1babff4b12 100644 --- a/rubocop/rubocop-code_reuse.yml +++ b/rubocop/rubocop-code_reuse.yml @@ -41,3 +41,4 @@ CodeReuse/ActiveRecord: - ee/db/fixtures/**/*.rb - ee/lib/tasks/**/*.rake - ee/lib/ee/gitlab/background_migration/**/*.rb + - ee/lib/gitlab/llm/open_ai/response_modifiers/tanuki_bot.rb |