diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-20 18:19:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-20 18:19:03 +0300 |
| commit | 14bd84b61276ef29b97d23642d698de769bacfd2 (patch) | |
| tree | f9eba90140c1bd874211dea17750a0d422c04080 /app/services/protected_branches | |
| parent | 891c388697b2db0d8ee0c8358a9bdbf6dc56d581 (diff) | |
Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.0-rc42
Diffstat (limited to 'app/services/protected_branches')
| -rw-r--r-- | app/services/protected_branches/base_service.rb | 2 | ||||
| -rw-r--r-- | app/services/protected_branches/cache_service.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/services/protected_branches/base_service.rb b/app/services/protected_branches/base_service.rb index 951017b2d01..6906ab2b642 100644 --- a/app/services/protected_branches/base_service.rb +++ b/app/services/protected_branches/base_service.rb @@ -21,3 +21,5 @@ module ProtectedBranches end end end + +ProtectedBranches::BaseService.prepend_mod diff --git a/app/services/protected_branches/cache_service.rb b/app/services/protected_branches/cache_service.rb index 4a9fc335421..ac02bf25617 100644 --- a/app/services/protected_branches/cache_service.rb +++ b/app/services/protected_branches/cache_service.rb @@ -73,7 +73,8 @@ module ProtectedBranches end def redis_key - @redis_key ||= if Feature.enabled?(:group_protected_branches) + group = project_or_group.is_a?(Group) ? project_or_group : project_or_group.group + @redis_key ||= if Feature.enabled?(:group_protected_branches, group) [CACHE_ROOT_KEY, project_or_group.class.name, project_or_group.id].join(':') else [CACHE_ROOT_KEY, project_or_group.id].join(':') |