mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-17 00:26:07 +10:00
Rémy CoutableandRobert Speicher
106f7f308c
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 2c3f3cb392)
24 lines
699 B
Ruby
24 lines
699 B
Ruby
require 'carrierwave/orm/activerecord'
|
|
|
|
class ProjectImportData < ActiveRecord::Base
|
|
belongs_to :project
|
|
attr_encrypted :credentials,
|
|
key: Gitlab::Application.secrets.db_key_base,
|
|
marshal: true,
|
|
encode: true,
|
|
mode: :per_attribute_iv_and_salt,
|
|
insecure_mode: true,
|
|
algorithm: 'aes-256-cbc'
|
|
|
|
serialize :data, JSON
|
|
|
|
validates :project, presence: true
|
|
|
|
before_validation :symbolize_credentials
|
|
|
|
def symbolize_credentials
|
|
# bang doesn't work here - attr_encrypted makes it not to work
|
|
self.credentials = self.credentials.deep_symbolize_keys unless self.credentials.blank?
|
|
end
|
|
end
|