summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-06-03 17:01:10 +0000
committerRobert Speicher <rspeicher@gmail.com>2019-06-03 17:01:10 +0000
commit2b13462ac4f091a56c538042712dcf736bb50474 (patch)
treeb4002864f93c390cf2214aa82c4536077447e71b /spec/features
parent3dcf3cfde35d1506c7196634080849d002251a41 (diff)
parent93a5071a3bde5db57f8f763a1c958a00fa6b4bf8 (diff)
downloadgitlab-ce-2b13462ac4f091a56c538042712dcf736bb50474.tar.gz
Merge branch 'security-58856-persistent-xss-in-note-objects' into 'master'
Persistent XSS in note objects CE See merge request gitlab/gitlabhq!3075
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/projects/import_export/export_file_spec.rb2
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 f76f9ba7577..9d74a96ab3d 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 encrypted] }
+ let(:sensitive_words) { %w[pass secret token key encrypted html] }
let(:safe_list) do
{
token: [ProjectHook, Ci::Trigger, CommitStatus],