diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-12-03 13:25:20 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-12-03 13:25:20 +0100 |
| commit | 0f5073d9bb2dc5c7677c31605d66e2cc30f48d1f (patch) | |
| tree | e0e128f0f2bc3f6b668dd7c2874ec5462d37080b | |
| parent | 143b80bb37d9534ec0b48900d3ab3287c58f68f0 (diff) | |
| download | gitlab-ce-0f5073d9bb2dc5c7677c31605d66e2cc30f48d1f.tar.gz | |
Migrate runners token first before fully switching
| -rw-r--r-- | app/models/ci/runner.rb | 2 | ||||
| -rw-r--r-- | app/models/group.rb | 2 | ||||
| -rw-r--r-- | app/models/project.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index a4645658c72..260348c97b2 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -10,7 +10,7 @@ module Ci include FromUnion include TokenAuthenticatable - add_authentication_token_field :token, encrypted: true, fallback: true + add_authentication_token_field :token, encrypted: true, migrating: true enum access_level: { not_protected: 0, diff --git a/app/models/group.rb b/app/models/group.rb index e90b28bfa02..02ddc8762af 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -55,7 +55,7 @@ class Group < Namespace validates :two_factor_grace_period, presence: true, numericality: { greater_than_or_equal_to: 0 } - add_authentication_token_field :runners_token, encrypted: true, fallback: true + add_authentication_token_field :runners_token, encrypted: true, migrating: true after_create :post_create_hook after_destroy :post_destroy_hook diff --git a/app/models/project.rb b/app/models/project.rb index c6351e1c7fc..9563e145bb8 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -85,7 +85,7 @@ class Project < ActiveRecord::Base default_value_for :snippets_enabled, gitlab_config_features.snippets default_value_for :only_allow_merge_if_all_discussions_are_resolved, false - add_authentication_token_field :runners_token, encrypted: true, fallback: true + add_authentication_token_field :runners_token, encrypted: true, migrating: true before_validation :mark_remote_mirrors_for_removal, if: -> { RemoteMirror.table_exists? } |