Merge branch...

Merge branch '214382-remove-application_settings_tokens_optional_encryption-feature-flag' into 'master'

Disable application_settings_tokens_optional_encryption feature flag

See merge request gitlab-org/gitlab!31798

app/models/application_setting.rb

@@ -9,7 +9,7 @@ class ApplicationSetting < ApplicationRecord
   GRAFANA_URL_ERROR_MESSAGE = 'Please check your Grafana URL setting in ' \
     'Admin Area > Settings > Metrics and profiling > Metrics - Grafana'
 
-  add_authentication_token_field :runners_registration_token, encrypted: -> { Feature.enabled?(:application_settings_tokens_optional_encryption, default_enabled: true) ? :optional : :required }
+  add_authentication_token_field :runners_registration_token, encrypted: -> { Feature.enabled?(:application_settings_tokens_optional_encryption) ? :optional : :required }
   add_authentication_token_field :health_check_access_token
   add_authentication_token_field :static_objects_external_storage_auth_token
 

changelogs/unreleased/214382-remove-application_settings_tokens_optional_encryption-feature-fla.yml

+---
+title: Disable application_settings_tokens_optional_encryption feature flag.
+merge_request: 31798
+author: Gilang Gumilar
+type: changed