diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
| commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
| tree | 78be5963ec075d80116a932011d695dd33910b4e /app/services/resource_access_tokens/create_service.rb | |
| parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/services/resource_access_tokens/create_service.rb')
| -rw-r--r-- | app/services/resource_access_tokens/create_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/resource_access_tokens/create_service.rb b/app/services/resource_access_tokens/create_service.rb index 2d0a78feb8e..c253154c1b7 100644 --- a/app/services/resource_access_tokens/create_service.rb +++ b/app/services/resource_access_tokens/create_service.rb @@ -32,7 +32,9 @@ module ResourceAccessTokens attr_reader :resource_type, :resource def feature_enabled? - ::Feature.enabled?(:resource_access_token, resource) + return false if ::Gitlab.com? + + ::Feature.enabled?(:resource_access_token, resource, default_enabled: true) end def has_permission_to_create? |