diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-23 00:09:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-23 00:09:53 +0300 |
| commit | d6d1051383d42211e5f4d2752d60f946f21df1b7 (patch) | |
| tree | e9f8a0c60c17ebc26a96e5349656d12d9aeb2a7f /app/models/bulk_imports/configuration.rb | |
| parent | 0a5e00b6914944295b31ce10ffd5429cbe9fae89 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/bulk_imports/configuration.rb')
| -rw-r--r-- | app/models/bulk_imports/configuration.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/bulk_imports/configuration.rb b/app/models/bulk_imports/configuration.rb index 4c6f745c268..6d9f598583e 100644 --- a/app/models/bulk_imports/configuration.rb +++ b/app/models/bulk_imports/configuration.rb @@ -12,11 +12,11 @@ class BulkImports::Configuration < ApplicationRecord allow_nil: true attr_encrypted :url, - key: Settings.attr_encrypted_db_key_base_truncated, + key: Settings.attr_encrypted_db_key_base_32, mode: :per_attribute_iv, algorithm: 'aes-256-gcm' attr_encrypted :access_token, - key: Settings.attr_encrypted_db_key_base_truncated, + key: Settings.attr_encrypted_db_key_base_32, mode: :per_attribute_iv, algorithm: 'aes-256-gcm' end |