diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-10-03 11:15:50 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-10-03 11:15:50 +0000 |
| commit | e113e2517c9b23cd573a722e46abff3c9017bddb (patch) | |
| tree | 90704b6ab3fabaa74679df54de985abc0909e423 | |
| parent | c375171bfd4b25d8cf4d7a95e2c65c655c7d647c (diff) | |
| parent | 2645862f687eb32718bef3a033a5d5a1845510a6 (diff) | |
| download | gitlab-ce-e113e2517c9b23cd573a722e46abff3c9017bddb.tar.gz | |
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
| -rw-r--r-- | spec/features/projects/import_export/export_file_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/projects/import_export/export_file_spec.rb b/spec/features/projects/import_export/export_file_spec.rb index a2b96514d64..f76f9ba7577 100644 --- a/spec/features/projects/import_export/export_file_spec.rb +++ b/spec/features/projects/import_export/export_file_spec.rb @@ -12,7 +12,7 @@ describe 'Import/Export - project export integration test', :js do let(:export_path) { "#{Dir.tmpdir}/import_file_spec" } 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 { token: [ProjectHook, Ci::Trigger, CommitStatus], |