Commit e113e251 authored by Nick Thomas's avatar Nick Thomas

Merge branch '52066-blacklist-encrypted_-columns-in-gitlab-project-export' into 'master'

Resolve "Blacklist `encrypted_*` columns in gitlab project export"

Closes #52066

See merge request gitlab-org/gitlab-ce!22072
parents c375171b 2645862f
...@@ -12,7 +12,7 @@ describe 'Import/Export - project export integration test', :js do ...@@ -12,7 +12,7 @@ describe 'Import/Export - project export integration test', :js do
let(:export_path) { "#{Dir.tmpdir}/import_file_spec" } let(:export_path) { "#{Dir.tmpdir}/import_file_spec" }
let(:config_hash) { YAML.load_file(Gitlab::ImportExport.config_file).deep_stringify_keys } let(:config_hash) { YAML.load_file(Gitlab::ImportExport.config_file).deep_stringify_keys }
let(:sensitive_words) { %w[pass secret token key] } let(:sensitive_words) { %w[pass secret token key encrypted] }
let(:safe_list) do let(:safe_list) do
{ {
token: [ProjectHook, Ci::Trigger, CommitStatus], token: [ProjectHook, Ci::Trigger, CommitStatus],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment