diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-14 16:38:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-14 16:38:57 +0300 |
| commit | 10e18de60f55811137871acefd331d2d5a41f237 (patch) | |
| tree | b227511752fb7021acec83fd3b2b5499434ae7f8 /app/models/application_setting_implementation.rb | |
| parent | 757327a59bcaecb986b0c07ae0cf09ed011e18ce (diff) | |
Add latest changes from gitlab-org/gitlab@13-12-stable-ee
Diffstat (limited to 'app/models/application_setting_implementation.rb')
| -rw-r--r-- | app/models/application_setting_implementation.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb index 5ff1c653f9e..bf9df3b9efc 100644 --- a/app/models/application_setting_implementation.rb +++ b/app/models/application_setting_implementation.rb @@ -374,6 +374,7 @@ module ApplicationSettingImplementation def usage_ping_enabled usage_ping_can_be_configured? && super end + alias_method :usage_ping_enabled?, :usage_ping_enabled def allowed_key_types SUPPORTED_KEY_TYPES.select do |type| |