Make runners token encryption to be optional
This commit is contained in:
parent
19356faa81
commit
851697a82e
4 changed files with 4 additions and 4 deletions
|
@ -7,7 +7,7 @@ class ApplicationSetting < ActiveRecord::Base
|
||||||
include IgnorableColumn
|
include IgnorableColumn
|
||||||
include ChronicDurationAttribute
|
include ChronicDurationAttribute
|
||||||
|
|
||||||
add_authentication_token_field :runners_registration_token, encrypted: -> { Feature.enabled?(:application_settings_tokens_optional_encryption) ? :optional : :required }
|
add_authentication_token_field :runners_registration_token, encrypted: -> { Feature.enabled?(:application_settings_tokens_optional_encryption, default_enabled: true) ? :optional : :required }
|
||||||
add_authentication_token_field :health_check_access_token
|
add_authentication_token_field :health_check_access_token
|
||||||
|
|
||||||
DOMAIN_LIST_SEPARATOR = %r{\s*[,;]\s* # comma or semicolon, optionally surrounded by whitespace
|
DOMAIN_LIST_SEPARATOR = %r{\s*[,;]\s* # comma or semicolon, optionally surrounded by whitespace
|
||||||
|
|
|
@ -10,7 +10,7 @@ module Ci
|
||||||
include FromUnion
|
include FromUnion
|
||||||
include TokenAuthenticatable
|
include TokenAuthenticatable
|
||||||
|
|
||||||
add_authentication_token_field :token, encrypted: -> { Feature.enabled?(:ci_runners_tokens_optional_encryption) ? :optional : :required }
|
add_authentication_token_field :token, encrypted: -> { Feature.enabled?(:ci_runners_tokens_optional_encryption, default_enabled: true) ? :optional : :required }
|
||||||
|
|
||||||
enum access_level: {
|
enum access_level: {
|
||||||
not_protected: 0,
|
not_protected: 0,
|
||||||
|
|
|
@ -56,7 +56,7 @@ class Group < Namespace
|
||||||
|
|
||||||
validates :two_factor_grace_period, presence: true, numericality: { greater_than_or_equal_to: 0 }
|
validates :two_factor_grace_period, presence: true, numericality: { greater_than_or_equal_to: 0 }
|
||||||
|
|
||||||
add_authentication_token_field :runners_token, encrypted: -> { Feature.enabled?(:groups_tokens_optional_encryption) ? :optional : :required }
|
add_authentication_token_field :runners_token, encrypted: -> { Feature.enabled?(:groups_tokens_optional_encryption, default_enabled: true) ? :optional : :required }
|
||||||
|
|
||||||
after_create :post_create_hook
|
after_create :post_create_hook
|
||||||
after_destroy :post_destroy_hook
|
after_destroy :post_destroy_hook
|
||||||
|
|
|
@ -84,7 +84,7 @@ class Project < ActiveRecord::Base
|
||||||
default_value_for :snippets_enabled, gitlab_config_features.snippets
|
default_value_for :snippets_enabled, gitlab_config_features.snippets
|
||||||
default_value_for :only_allow_merge_if_all_discussions_are_resolved, false
|
default_value_for :only_allow_merge_if_all_discussions_are_resolved, false
|
||||||
|
|
||||||
add_authentication_token_field :runners_token, encrypted: -> { Feature.enabled?(:projects_tokens_optional_encryption) ? :optional : :required }
|
add_authentication_token_field :runners_token, encrypted: -> { Feature.enabled?(:projects_tokens_optional_encryption, default_enabled: true) ? :optional : :required }
|
||||||
|
|
||||||
before_validation :mark_remote_mirrors_for_removal, if: -> { RemoteMirror.table_exists? }
|
before_validation :mark_remote_mirrors_for_removal, if: -> { RemoteMirror.table_exists? }
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue