diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-28 09:55:19 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-28 09:55:19 +0200 |
| commit | 31c95aa031ea6e5e7cd1bf8d08e3c6543f0ab2e7 (patch) | |
| tree | 831f95363922a1c6848f6706d83b62a30d8eec73 | |
| parent | c9a46263336dd38aef90b71995e2790be72d441d (diff) | |
| download | gitlab-ce-31c95aa031ea6e5e7cd1bf8d08e3c6543f0ab2e7.tar.gz | |
add missing attribute to attr_encrypted so it is fully backwards-compatible
| -rw-r--r-- | app/models/ci/variable.rb | 1 | ||||
| -rw-r--r-- | app/models/project_import_data.rb | 1 | ||||
| -rw-r--r-- | app/models/user.rb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/app/models/ci/variable.rb b/app/models/ci/variable.rb index f8d5d4486fd..c9c47ec7419 100644 --- a/app/models/ci/variable.rb +++ b/app/models/ci/variable.rb @@ -13,6 +13,7 @@ module Ci attr_encrypted :value, mode: :per_attribute_iv_and_salt, + insecure_mode: true, key: Gitlab::Application.secrets.db_key_base, algorithm: 'aes-256-cbc' end diff --git a/app/models/project_import_data.rb b/app/models/project_import_data.rb index ca8a9b4217b..331123a5a5b 100644 --- a/app/models/project_import_data.rb +++ b/app/models/project_import_data.rb @@ -7,6 +7,7 @@ class ProjectImportData < ActiveRecord::Base marshal: true, encode: true, mode: :per_attribute_iv_and_salt, + insecure_mode: true, algorithm: 'aes-256-cbc' serialize :data, JSON diff --git a/app/models/user.rb b/app/models/user.rb index 599b2fb1191..767d6366c79 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -25,6 +25,7 @@ class User < ActiveRecord::Base attr_encrypted :otp_secret, key: Gitlab::Application.config.secret_key_base, mode: :per_attribute_iv_and_salt, + insecure_mode: true, algorithm: 'aes-256-cbc' devise :two_factor_authenticatable, |