summaryrefslogtreecommitdiff
path: root/rubocop/cop/gitlab/json.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
commitb76ae638462ab0f673e5915986070518dd3f9ad3 (patch)
treebdab0533383b52873be0ec0eb4d3c66598ff8b91 /rubocop/cop/gitlab/json.rb
parent434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff)
downloadgitlab-ce-14.2.0-rc42.tar.gz
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'rubocop/cop/gitlab/json.rb')
-rw-r--r--rubocop/cop/gitlab/json.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/rubocop/cop/gitlab/json.rb b/rubocop/cop/gitlab/json.rb
index 7cc719aca09..d2ba0012ca0 100644
--- a/rubocop/cop/gitlab/json.rb
+++ b/rubocop/cop/gitlab/json.rb
@@ -10,7 +10,7 @@ module RuboCop
EOL
def_node_matcher :json_node?, <<~PATTERN
- (send (const nil? :JSON)...)
+ (send (const {nil? | (const nil? :ActiveSupport)} :JSON)...)
PATTERN
def on_send(node)