Commit 92cb41df authored by Etienne Baqué's avatar Etienne Baqué

Merge branch 'kerrizor/cleanup-spec-error-language' into 'master'

Minor Cleanup of spec language

See merge request gitlab-org/gitlab!61805
parents 74b7bc04 439b3c7e
...@@ -35,8 +35,9 @@ RSpec.describe 'Import/Export attribute configuration' do ...@@ -35,8 +35,9 @@ RSpec.describe 'Import/Export attribute configuration' do
<<-MSG <<-MSG
It looks like #{relation_class}, which is exported using the project Import/Export, has new attributes: #{new_attributes.join(',')} It looks like #{relation_class}, which is exported using the project Import/Export, has new attributes: #{new_attributes.join(',')}
Please add the attribute(s) to SAFE_MODEL_ATTRIBUTES if you consider this can be exported. Please add the attribute(s) to SAFE_MODEL_ATTRIBUTES if they can be exported.
Please blacklist the attribute(s) in IMPORT_EXPORT_CONFIG by adding it to its correspondent
Please denylist the attribute(s) in IMPORT_EXPORT_CONFIG by adding it to its corresponding
model in the +excluded_attributes+ section. model in the +excluded_attributes+ section.
SAFE_MODEL_ATTRIBUTES: #{File.expand_path(safe_attributes_file)} SAFE_MODEL_ATTRIBUTES: #{File.expand_path(safe_attributes_file)}
......
...@@ -38,8 +38,9 @@ RSpec.describe 'Import/Export Project configuration' do ...@@ -38,8 +38,9 @@ RSpec.describe 'Import/Export Project configuration' do
<<-MSG <<-MSG
It looks like #{relation_class}, which is exported using the project Import/Export, has references: #{prohibited_keys.join(',')} It looks like #{relation_class}, which is exported using the project Import/Export, has references: #{prohibited_keys.join(',')}
Please replace it with actual relation in IMPORT_EXPORT_CONFIG if you consider this can be exported. Please replace it with actual relation in IMPORT_EXPORT_CONFIG if they can be exported.
Please blacklist the attribute(s) in IMPORT_EXPORT_CONFIG by adding it to its correspondent
Please denylist the attribute(s) in IMPORT_EXPORT_CONFIG by adding it to its corresponding
model in the +excluded_attributes+ section. model in the +excluded_attributes+ section.
IMPORT_EXPORT_CONFIG: #{Gitlab::ImportExport.config_file} IMPORT_EXPORT_CONFIG: #{Gitlab::ImportExport.config_file}
......
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