diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-28 08:48:06 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-28 16:52:55 -0400 |
| commit | 106f7f308c82ff294a3266f2b45e53f8d7d4cc65 (patch) | |
| tree | c6d1c8ce5270e9bc9b7c1721308d6aa734a97649 | |
| parent | 887d7202635b94f3854e9212e9efed1810dc5949 (diff) | |
| download | gitlab-ce-106f7f308c82ff294a3266f2b45e53f8d7d4cc65.tar.gz | |
Merge branch 'fix/attr-encrypted-issue' into 'master'
Fix encrypted data backwards compatibility after upgrading attr_encrypted gem
Adds missing attribute to attr_encrypted so it is fully backwards-compatible. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19073
See merge request !4963
(cherry picked from commit 2c3f3cb3920c5242cbc66456b3eed423636a2128)
| -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 7d3e4edc5e9..7137036b195 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, |