diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
| commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
| tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /spec/support/import_export | |
| parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
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 |