diff options
| author | James Lopez <james@jameslopez.es> | 2016-03-07 12:50:35 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-03-07 12:50:35 +0100 |
| commit | 735563329d1f86ee4d72b37cd22eed1168935e8e (patch) | |
| tree | 71f2354eeab407a06101dbf96696a72475d35727 /app/models | |
| parent | 7085850c50a6dd7072bd2c80f092b0c20f74d1dc (diff) | |
| download | gitlab-ce-735563329d1f86ee4d72b37cd22eed1168935e8e.tar.gz | |
refactored a bunch of stuff based on MR feedback
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project_import_data.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_import_data.rb b/app/models/project_import_data.rb index 23f4e97b8aa..f3b9daa0d1a 100644 --- a/app/models/project_import_data.rb +++ b/app/models/project_import_data.rb @@ -12,7 +12,7 @@ require 'file_size_validator' class ProjectImportData < ActiveRecord::Base belongs_to :project - attr_encrypted :credentials, key: Gitlab::Application.secrets.db_key_base, marshal: true + attr_encrypted :credentials, key: Gitlab::Application.secrets.db_key_base, marshal: true, encode: true serialize :data, JSON |