diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-12 18:10:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-12 18:10:33 +0300 |
| commit | 8ff63012e9b7e3dc2279e636868af9a438d1fa93 (patch) | |
| tree | 4dd67f247345cbc2e8629c4a5f2b935dafc988e3 /app/helpers/application_settings_helper.rb | |
| parent | ef7cfec30c9fab7b9e757877c472ca7ca2eccc2d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index f36a638555a..df8009c3d00 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -367,7 +367,7 @@ module ApplicationSettingsHelper end end -ApplicationSettingsHelper.prepend_if_ee('EE::ApplicationSettingsHelper') # rubocop: disable Cop/InjectEnterpriseEditionModule +ApplicationSettingsHelper.prepend_if_ee('EE::ApplicationSettingsHelper') # The methods in `EE::ApplicationSettingsHelper` should be available as both # instance and class methods. |