Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
22b99a52
Commit
22b99a52
authored
Mar 24, 2021
by
Serena Fang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change group and policy to return super
parent
9b563145
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
ee/app/policies/ee/group_policy.rb
ee/app/policies/ee/group_policy.rb
+3
-1
ee/app/policies/ee/project_policy.rb
ee/app/policies/ee/project_policy.rb
+3
-1
No files found.
ee/app/policies/ee/group_policy.rb
View file @
22b99a52
...
...
@@ -393,7 +393,9 @@ module EE
# Available in Core for self-managed but only paid, non-trial for .com to prevent abuse
override
: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
)
end
...
...
ee/app/policies/ee/project_policy.rb
View file @
22b99a52
...
...
@@ -425,7 +425,9 @@ module EE
# Available in Core for self-managed but only paid, non-trial for .com to prevent abuse
override
: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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment