Commit eeb13c16 authored by James Lopez's avatar James Lopez

rename method and added note to export file spec about new encrypted attributes

parent bb220126
......@@ -62,7 +62,7 @@ module Gitlab
update_project_references
handle_group_label if group_label?
reset_ci_tokens!
reset_tokens!
@relation_hash['data'].deep_symbolize_keys! if @relation_name == :events && @relation_hash['data']
set_st_diffs if @relation_name == :merge_request_diff
......@@ -142,7 +142,7 @@ module Gitlab
end
end
def reset_ci_tokens!
def reset_tokens!
return unless Gitlab::ImportExport.reset_tokens? && TOKEN_RESET_MODELS.include?(@relation_name.to_s)
# If we import/export a project to the same instance, tokens will have to be reset.
......
......@@ -74,6 +74,9 @@ feature 'Import/Export - project export integration test', feature: true, js: tr
Otherwise, please add the exception to +safe_list+ in CURRENT_SPEC using #{sensitive_word} as the key and the
correspondent hash or model as the value.
Also, if the attribute is encrypted, please add it to either the list of excluded attributes in IMPORT_EXPORT_CONFIG
or the model to RelationFactory::TOKEN_RESET_MODELS if it includes a token that can be reset.
IMPORT_EXPORT_CONFIG: #{Gitlab::ImportExport.config_file}
CURRENT_SPEC: #{__FILE__}
MSG
......
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