summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcharlieablett <cablett@gitlab.com>2019-04-26 09:40:00 +1200
committercharlieablett <cablett@gitlab.com>2019-04-26 11:09:36 +1200
commit4b92cb50aa7a937a2671e48a21c1cfaca661699b (patch)
tree6fe3f6071e04ea5498d12dee0f03bfd1e42efcda
parent089b598b4e7653d2ce36497d4bc8c601d76c8647 (diff)
downloadgitlab-ce-4b92cb50aa7a937a2671e48a21c1cfaca661699b.tar.gz
Tighten up prohibited_key method
-rw-r--r--lib/gitlab/import_export/attribute_cleaner.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/gitlab/import_export/attribute_cleaner.rb b/lib/gitlab/import_export/attribute_cleaner.rb
index 1faa3c1614f..f476905b6db 100644
--- a/lib/gitlab/import_export/attribute_cleaner.rb
+++ b/lib/gitlab/import_export/attribute_cleaner.rb
@@ -28,11 +28,10 @@ module Gitlab
return true if 'cached_markdown_version'.equal?(key)
- prohibited_suffices = %w(_id _html)
- prohibited_suffices.each do |suffix|
- return true if key.end_with?(suffix)
+ prohibited_suffixes = %w(_id _html)
+ prohibited_suffixes.any? do |suffix|
+ true if key.end_with?(suffix)
end
- false
end
def allowed_reference?(key)