diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 13:26:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 13:26:31 +0000 |
| commit | b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db (patch) | |
| tree | 5ab080ca9cadeb6cd9578bf301e4e9e8810bed9e /app/services/protected_branches | |
| parent | 25cb337cf12438169f1b14bc5dace8a06a7356e3 (diff) | |
| download | gitlab-ce-b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/protected_branches')
4 files changed, 8 insertions, 0 deletions
diff --git a/app/services/protected_branches/access_level_params.rb b/app/services/protected_branches/access_level_params.rb index a7ef573ff0b..e34bc23b4dc 100644 --- a/app/services/protected_branches/access_level_params.rb +++ b/app/services/protected_branches/access_level_params.rb @@ -33,3 +33,5 @@ module ProtectedBranches end end end + +ProtectedBranches::AccessLevelParams.prepend_if_ee('EE::ProtectedBranches::AccessLevelParams') diff --git a/app/services/protected_branches/api_service.rb b/app/services/protected_branches/api_service.rb index 1b13dace5f2..ac4917d6590 100644 --- a/app/services/protected_branches/api_service.rb +++ b/app/services/protected_branches/api_service.rb @@ -15,3 +15,5 @@ module ProtectedBranches end end end + +ProtectedBranches::ApiService.prepend_if_ee('EE::ProtectedBranches::ApiService') diff --git a/app/services/protected_branches/create_service.rb b/app/services/protected_branches/create_service.rb index 6b2836bba39..3c86d7d087d 100644 --- a/app/services/protected_branches/create_service.rb +++ b/app/services/protected_branches/create_service.rb @@ -25,3 +25,5 @@ module ProtectedBranches end end end + +ProtectedBranches::CreateService.prepend_if_ee('EE::ProtectedBranches::CreateService') diff --git a/app/services/protected_branches/legacy_api_update_service.rb b/app/services/protected_branches/legacy_api_update_service.rb index 7cb8d41818f..65dc3297ae8 100644 --- a/app/services/protected_branches/legacy_api_update_service.rb +++ b/app/services/protected_branches/legacy_api_update_service.rb @@ -48,3 +48,5 @@ module ProtectedBranches end end end + +ProtectedBranches::LegacyApiUpdateService.prepend_if_ee('EE::ProtectedBranches::LegacyApiUpdateService') |