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/auth_helper.rb | |
| parent | ef7cfec30c9fab7b9e757877c472ca7ca2eccc2d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/auth_helper.rb')
| -rw-r--r-- | app/helpers/auth_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb index 12f75217a8a..a57e27d23c8 100644 --- a/app/helpers/auth_helper.rb +++ b/app/helpers/auth_helper.rb @@ -152,7 +152,7 @@ module AuthHelper extend self end -AuthHelper.prepend_if_ee('EE::AuthHelper') # rubocop: disable Cop/InjectEnterpriseEditionModule +AuthHelper.prepend_if_ee('EE::AuthHelper') # The methods added in EE should be available as both class and instance # methods, just like the methods provided by `AuthHelper` itself. |