diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-02 15:10:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-02 15:10:35 +0300 |
| commit | 4fa04f789e6fed5f0dfeafe718eeb7f56a5086e9 (patch) | |
| tree | 5ef2d1d8232d3bd359ec79bf95c9a35ce650ae0b /spec/support/import_export | |
| parent | 4b9ace6c1fead1b44f173eaee0cfaa58f46a258a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/import_export')
| -rw-r--r-- | spec/support/import_export/configuration_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/import_export/configuration_helper.rb b/spec/support/import_export/configuration_helper.rb index 6f67b0f3dd7..b731ee626c0 100644 --- a/spec/support/import_export/configuration_helper.rb +++ b/spec/support/import_export/configuration_helper.rb @@ -44,8 +44,8 @@ module ConfigurationHelper import_export_config = config_hash(config) excluded_attributes = import_export_config[:excluded_attributes][relation_name.to_sym] included_attributes = import_export_config[:included_attributes][relation_name.to_sym] - attributes = attributes - Gitlab::Json.parse(excluded_attributes.to_json) if excluded_attributes - attributes = attributes & Gitlab::Json.parse(included_attributes.to_json) if included_attributes + attributes -= Gitlab::Json.parse(excluded_attributes.to_json) if excluded_attributes + attributes &= Gitlab::Json.parse(included_attributes.to_json) if included_attributes attributes end |