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/models/concerns/protected_ref_access.rb | |
| parent | ef7cfec30c9fab7b9e757877c472ca7ca2eccc2d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/protected_ref_access.rb')
| -rw-r--r-- | app/models/concerns/protected_ref_access.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/protected_ref_access.rb b/app/models/concerns/protected_ref_access.rb index 7373f006d64..d1e3d9b2aff 100644 --- a/app/models/concerns/protected_ref_access.rb +++ b/app/models/concerns/protected_ref_access.rb @@ -50,8 +50,8 @@ module ProtectedRefAccess end end -ProtectedRefAccess.include_if_ee('EE::ProtectedRefAccess::Scopes') # rubocop: disable Cop/InjectEnterpriseEditionModule -ProtectedRefAccess.prepend_if_ee('EE::ProtectedRefAccess') # rubocop: disable Cop/InjectEnterpriseEditionModule +ProtectedRefAccess.include_if_ee('EE::ProtectedRefAccess::Scopes') +ProtectedRefAccess.prepend_if_ee('EE::ProtectedRefAccess') # When using `prepend` (or `include` for that matter), the `ClassMethods` # constants are not merged. This means that `class_methods` in |