summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-02-16 00:15:19 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-02-16 00:15:19 +0000
commitb57f24ba167742f7665a02cd7113d700197ac4a7 (patch)
tree81f737ccf94a661affe5dc277be1ed08d1c2c91c /lib/gitlab
parent1760f824bb6bcac278e95493805dff70a5b2a75b (diff)
downloadgitlab-ce-b57f24ba167742f7665a02cd7113d700197ac4a7.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/security/scan_configuration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/security/scan_configuration.rb b/lib/gitlab/security/scan_configuration.rb
index 67c4fd22b29..381adda7991 100644
--- a/lib/gitlab/security/scan_configuration.rb
+++ b/lib/gitlab/security/scan_configuration.rb
@@ -21,7 +21,7 @@ module Gitlab
%i[sast sast_iac secret_detection].include?(type)
end
- def can_enable_in_merge_request?
+ def can_enable_by_merge_request?
scans_configurable_in_merge_request.include?(type)
end