From 1cbdc5326c779999350481b0aae78364837f3bb6 Mon Sep 17 00:00:00 2001 From: charlieablett Date: Tue, 30 Apr 2019 11:25:09 +1200 Subject: [PATCH] Refactor `attribute_cleaner` for readability --- lib/gitlab/import_export/attribute_cleaner.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/gitlab/import_export/attribute_cleaner.rb b/lib/gitlab/import_export/attribute_cleaner.rb index 537cb36c89b..7f67f63f26b 100644 --- a/lib/gitlab/import_export/attribute_cleaner.rb +++ b/lib/gitlab/import_export/attribute_cleaner.rb @@ -18,13 +18,15 @@ module Gitlab def clean @relation_hash.reject do |key, _value| - (prohibited_key?(key) && !permitted_key?(key)) || !@relation_class.attribute_method?(key) || excluded_key?(key) + prohibited_key?(key) || !@relation_class.attribute_method?(key) || excluded_key?(key) end.except('id') end private def prohibited_key?(key) + return false if permitted_key?(key) + 'cached_markdown_version' == key || PROHIBITED_SUFFIXES.any? {|suffix| key.end_with?(suffix)} end