Commit 22b99a52 authored by Serena Fang's avatar Serena Fang

Change group and policy to return super

parent 9b563145
...@@ -393,7 +393,9 @@ module EE ...@@ -393,7 +393,9 @@ module EE
# Available in Core for self-managed but only paid, non-trial for .com to prevent abuse # Available in Core for self-managed but only paid, non-trial for .com to prevent abuse
override :resource_access_token_feature_available? override :resource_access_token_feature_available?
def resource_access_token_feature_available? def resource_access_token_feature_available?
return true unless ::Gitlab.com? value_from_super = super
return value_from_super unless ::Gitlab.com?
value_from_super && group.feature_available_non_trial?(:resource_access_token) value_from_super && group.feature_available_non_trial?(:resource_access_token)
end end
......
...@@ -425,7 +425,9 @@ module EE ...@@ -425,7 +425,9 @@ module EE
# Available in Core for self-managed but only paid, non-trial for .com to prevent abuse # Available in Core for self-managed but only paid, non-trial for .com to prevent abuse
override :resource_access_token_feature_available? override :resource_access_token_feature_available?
def resource_access_token_feature_available? def resource_access_token_feature_available?
return true unless ::Gitlab.com? value_from_super = super
return value_from_super unless ::Gitlab.com?
group = project.namespace group = project.namespace
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment