diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-16 03:15:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-16 03:15:19 +0300 |
| commit | b57f24ba167742f7665a02cd7113d700197ac4a7 (patch) | |
| tree | 81f737ccf94a661affe5dc277be1ed08d1c2c91c /app/presenters/projects | |
| parent | 1760f824bb6bcac278e95493805dff70a5b2a75b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/presenters/projects')
| -rw-r--r-- | app/presenters/projects/security/configuration_presenter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/presenters/projects/security/configuration_presenter.rb b/app/presenters/projects/security/configuration_presenter.rb index 91c455c7c91..1798d4b780f 100644 --- a/app/presenters/projects/security/configuration_presenter.rb +++ b/app/presenters/projects/security/configuration_presenter.rb @@ -81,7 +81,7 @@ module Projects configured: scan.configured?, configuration_path: scan.configuration_path, available: scan.available?, - can_enable_in_merge_request: scan.can_enable_in_merge_request? + can_enable_by_merge_request: scan.can_enable_by_merge_request? } end |