Commit 9bec13bf authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'dblessing-resource-access-token-feature-move' into 'master'

Move resource_access_tokens to development feature flag

See merge request gitlab-org/gitlab!46376
parents 26087e16 42924aa4
--- ---
name: resource_access_token name: resource_access_token_feature
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29622 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29622
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235765 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235765
group: group::access group: group::access
type: licensed type: development
default_enabled: true default_enabled: true
...@@ -14,7 +14,6 @@ if Gitlab.ee? && Gitlab.dev_or_test_env? ...@@ -14,7 +14,6 @@ if Gitlab.ee? && Gitlab.dev_or_test_env?
# being unique to licensed names. These feature flags should be reworked to # being unique to licensed names. These feature flags should be reworked to
# be "development" with explicit check # be "development" with explicit check
IGNORED_FEATURE_FLAGS = %i[ IGNORED_FEATURE_FLAGS = %i[
resource_access_token
ci_secrets_management ci_secrets_management
feature_flags_related_issues feature_flags_related_issues
group_coverage_reports group_coverage_reports
......
...@@ -339,7 +339,8 @@ module EE ...@@ -339,7 +339,8 @@ module EE
def resource_access_token_available? def resource_access_token_available?
return true unless ::Gitlab.com? return true unless ::Gitlab.com?
group.feature_available_non_trial?(:resource_access_token) ::Feature.enabled?(:resource_access_token_feature, group, default_enabled: true) &&
group.feature_available_non_trial?(:resource_access_token)
end end
end end
end end
...@@ -356,7 +356,10 @@ module EE ...@@ -356,7 +356,10 @@ module EE
def resource_access_token_available? def resource_access_token_available?
return true unless ::Gitlab.com? return true unless ::Gitlab.com?
project.namespace.feature_available_non_trial?(:resource_access_token) group = project.namespace
::Feature.enabled?(:resource_access_token_feature, group, default_enabled: true) &&
group.feature_available_non_trial?(:resource_access_token)
end end
end end
end end
...@@ -401,7 +401,6 @@ RSpec.describe Namespace do ...@@ -401,7 +401,6 @@ RSpec.describe Namespace do
before do before do
create(:gitlab_subscription, :active_trial, namespace: group, hosted_plan: hosted_plan) create(:gitlab_subscription, :active_trial, namespace: group, hosted_plan: hosted_plan)
stub_licensed_features(feature => true)
stub_ee_application_setting(should_check_namespace_plan: true) stub_ee_application_setting(should_check_namespace_plan: true)
end end
......
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