Commit ed26027d authored by Dylan Griffith's avatar Dylan Griffith

Merge branch 'ci_builds_tokens_required_encryption' into 'master'

Add feature flag control builds token encryption [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!63874
parents a64ddaa8 e360673b
...@@ -212,7 +212,8 @@ module Ci ...@@ -212,7 +212,8 @@ module Ci
acts_as_taggable acts_as_taggable
add_authentication_token_field :token, encrypted: :optional add_authentication_token_field :token,
encrypted: -> { Gitlab::Ci::Features.require_builds_token_encryption? ? :required : :optional }
before_save :ensure_token before_save :ensure_token
before_destroy { unscoped_project } before_destroy { unscoped_project }
......
---
name: ci_builds_tokens_required_encryption
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63874
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333566
milestone: '14.0'
type: development
group: group::pipeline execution
default_enabled: false
...@@ -41,6 +41,10 @@ module Gitlab ...@@ -41,6 +41,10 @@ module Gitlab
def self.gldropdown_tags_enabled? def self.gldropdown_tags_enabled?
::Feature.enabled?(:gldropdown_tags, default_enabled: :yaml) ::Feature.enabled?(:gldropdown_tags, default_enabled: :yaml)
end end
def self.require_builds_token_encryption?
Feature.enabled?(:ci_builds_tokens_required_encryption, default_enabled: :yaml)
end
end end
end end
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