summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-07-20 12:08:52 +0200
committerJames Lopez <james@jameslopez.es>2016-07-20 12:08:52 +0200
commit457adb942cecb8ff40adee08fbce6bb3816707dc (patch)
tree05b472518a9a221068d6e5c2473d3ac13d3b427d
parentef2edcc10007d5d838acf278ed1e9e0c07cdc4fc (diff)
downloadgitlab-ce-457adb942cecb8ff40adee08fbce6bb3816707dc.tar.gz
prevent algorithm and key length issue for upgrades from an older GilLab version - 8.6 or earlier
-rw-r--r--db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb8
1 files changed, 7 insertions, 1 deletions
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