diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-20 13:58:54 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-20 15:56:40 +0300 |
| commit | ab883cf928d72726eaf65932b58c40db10993cf9 (patch) | |
| tree | ba7f651968cd5348c6a199fc80b2be929edca7a9 | |
| parent | 7d279cc5a12dc97f36a3588e2456617ed16885b0 (diff) | |
Merge branch 'fix/import_data-migration' into 'master'
Fix migration corrupting import data for old version upgrades
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19073
Not a fan of changing old migrations but this will prevent issues from upgrading GitLab version 8.6 or older to 8.10
More details of the issue on https://gitlab.com/gitlab-org/gitlab-ce/issues/19073#note_13190450
See merge request !5358
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 82d1e110aab..7bec5246544 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -134,6 +134,7 @@ v 8.10.0 (unreleased) - Allow bulk (un)subscription from issues in issue index - Fix MR diff encoding issues exporting GitLab projects - Export and import avatar as part of project import/export + - Fix migration corrupting import data for old version upgrades v 8.9.6 - Fix importing of events under notes for GitLab projects. !5154 diff --git a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb b/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb index ac7eac0ea7c..611767ac7fe 100644 --- a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb +++ b/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb @@ -7,7 +7,13 @@ class RemoveWrongImportUrlFromProjects < ActiveRecord::Migration class ProjectImportDataFake extend AttrEncrypted attr_accessor :credentials - attr_encrypted :credentials, key: Gitlab::Application.secrets.db_key_base, marshal: true, encode: true, :mode => :per_attribute_iv_and_salt + 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' end def up |