diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 10:33:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 10:33:21 +0300 |
| commit | 36a59d088eca61b834191dacea009677a96c052f (patch) | |
| tree | e4f33972dab5d8ef79e3944a9f403035fceea43f /app/models/group.rb | |
| parent | a1761f15ec2cae7c7f7bbda39a75494add0dfd6f (diff) | |
Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42
Diffstat (limited to 'app/models/group.rb')
| -rw-r--r-- | app/models/group.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 990c06fdc41..86f4b14cb6c 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -146,7 +146,7 @@ class Group < Namespace validates :group_feature, presence: true add_authentication_token_field :runners_token, - encrypted: -> { Feature.enabled?(:groups_tokens_optional_encryption, default_enabled: true) ? :optional : :required }, + encrypted: -> { Feature.enabled?(:groups_tokens_optional_encryption) ? :optional : :required }, prefix: RunnersTokenPrefixable::RUNNERS_TOKEN_PREFIX after_create :post_create_hook @@ -870,7 +870,7 @@ class Group < Namespace actors << self if root_ancestor != self actors.any? do |actor| - ::Feature.enabled?(feature_flag, actor, default_enabled: :yaml) + ::Feature.enabled?(feature_flag, actor) end end |