diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 13:32:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 13:32:43 +0300 |
| commit | 547a5884d1ab6a22d9fc9ce79e5cf6f0310bc23d (patch) | |
| tree | 655c2c0252d6ac08f0a825fac872f83845ee2e7f /lib/gitlab | |
| parent | 25e94f0fc4c4666dbbacfcbdd6bce0380b8fe1d0 (diff) | |
Add latest changes from gitlab-org/security/gitlab@14-4-stable-ee
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/background_migration/user_mentions/models/group.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/background_migration/user_mentions/models/group.rb b/lib/gitlab/background_migration/user_mentions/models/group.rb index a8b4b59b06c..310723570c2 100644 --- a/lib/gitlab/background_migration/user_mentions/models/group.rb +++ b/lib/gitlab/background_migration/user_mentions/models/group.rb @@ -11,6 +11,10 @@ module Gitlab has_one :saml_provider + def root_saml_provider + root_ancestor.saml_provider + end + def self.declarative_policy_class "GroupPolicy" end |