diff options
| author | James Lopez <james@jameslopez.es> | 2016-03-04 18:37:00 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-03-04 18:37:00 +0100 |
| commit | 7085850c50a6dd7072bd2c80f092b0c20f74d1dc (patch) | |
| tree | 11fbad852ad2f413c48d1e2a0681f7ea69d89de7 /app/models | |
| parent | c2b33d3b71215858892debeb45d93a69d530fd8e (diff) | |
| download | gitlab-ce-7085850c50a6dd7072bd2c80f092b0c20f74d1dc.tar.gz | |
fix specs
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project_import_data.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/project_import_data.rb b/app/models/project_import_data.rb index 493c82a94fa..23f4e97b8aa 100644 --- a/app/models/project_import_data.rb +++ b/app/models/project_import_data.rb @@ -12,8 +12,7 @@ require 'file_size_validator' class ProjectImportData < ActiveRecord::Base belongs_to :project - attr_encrypted :credentials, key: Gitlab::Application.secrets.db_key_base - serialize :credentials, JSON + attr_encrypted :credentials, key: Gitlab::Application.secrets.db_key_base, marshal: true serialize :data, JSON |