summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-24 02:03:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-24 02:03:49 +0000
commit2a25c83b18bafcaf5c21581ff085ab611eb514e8 (patch)
tree5ef885758a28be94c22051d388c782a4e60ef83b /app/models
parentb0481767fe49d53033d0a1c74b661f971e3cc680 (diff)
downloadgitlab-ce-2a25c83b18bafcaf5c21581ff085ab611eb514e8.tar.gz
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/models')
-rw-r--r--app/models/ci/runner.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 86879b9dc68..44a00e36bcc 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -10,7 +10,7 @@ module Ci
include TokenAuthenticatable
include IgnorableColumns
- 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: {
not_protected: 0,