summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne BaquƩ <ebaque@gitlab.com>2019-07-12 16:49:47 -0400
committerStan Hu <stanhu@gmail.com>2019-08-26 19:39:48 -0700
commit93cf4124737b20e3f810f0c0ad366271a9a0c251 (patch)
tree63b79153bd080c4af5783ae096a54f0f4a24f7f7
parent63ade4b819bd222eb436f271a4a919a199bc023b (diff)
downloadgitlab-ce-93cf4124737b20e3f810f0c0ad366271a9a0c251.tar.gz
Add encrypted optional option to DeployToken authentication field
-rw-r--r--app/models/deploy_token.rb2
-rw-r--r--config/database.yml.example0
2 files changed, 1 insertions, 1 deletions
diff --git a/app/models/deploy_token.rb b/app/models/deploy_token.rb
index 33f0be91632..85f5a2040c0 100644
--- a/app/models/deploy_token.rb
+++ b/app/models/deploy_token.rb
@@ -5,7 +5,7 @@ class DeployToken < ApplicationRecord
include TokenAuthenticatable
include PolicyActor
include Gitlab::Utils::StrongMemoize
- add_authentication_token_field :token
+ add_authentication_token_field :token, encrypted: :optional
AVAILABLE_SCOPES = %i(read_repository read_registry).freeze
GITLAB_DEPLOY_TOKEN_NAME = 'gitlab-deploy-token'.freeze
diff --git a/config/database.yml.example b/config/database.yml.example
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/config/database.yml.example