diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-11 03:10:14 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-11 03:10:14 +0000 |
| commit | fb8d6a526f0ef2da9fb247e15f9ff19279dba3d6 (patch) | |
| tree | 11c6697e314baf4d0e18f0aab10552109633946b /app/models | |
| parent | 9ae44f98c841d785b52087348de2e8cba9a13a2d (diff) | |
| download | gitlab-ce-fb8d6a526f0ef2da9fb247e15f9ff19279dba3d6.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -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| |