Merge branch 'ci-remove-ci_builds_tokens_required_encryption-ff' into 'master'

Require encryption for CI job tokens

See merge request gitlab-org/gitlab!65166

app/models/ci/build.rb

@@ -193,8 +193,7 @@ module Ci
 
     acts_as_taggable
 
-    add_authentication_token_field :token,
-      encrypted: -> { Gitlab::Ci::Features.require_builds_token_encryption? ? :required : :optional }
+    add_authentication_token_field :token, encrypted: :required
 
     before_save :ensure_token
     before_destroy { unscoped_project }

config/feature_flags/development/ci_builds_tokens_required_encryption.yml

----
-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

lib/gitlab/ci/features.rb

@@ -29,10 +29,6 @@ module Gitlab
       def self.gldropdown_tags_enabled?
         ::Feature.enabled?(:gldropdown_tags, default_enabled: :yaml)
       end
-
-      def self.require_builds_token_encryption?
-        Feature.enabled?(:ci_builds_tokens_required_encryption, default_enabled: :yaml)
-      end
     end
   end
 end