diff options
author | James Lopez <james@jameslopez.es> | 2016-05-18 17:48:15 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-05-18 17:48:15 +0200 |
commit | a5f04ad48849b94aabeeb7450c6059e76372855c (patch) | |
tree | 921e2c97eca4e9b7b00768bd3f7ae222c9ad9cc0 /lib/gitlab/import_export/attributes_finder.rb | |
parent | 301d64b84943f7f91588c330f2d22c172f529d52 (diff) | |
download | gitlab-ce-a5f04ad48849b94aabeeb7450c6059e76372855c.tar.gz |
fixed CI commits on export
Diffstat (limited to 'lib/gitlab/import_export/attributes_finder.rb')
-rw-r--r-- | lib/gitlab/import_export/attributes_finder.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/attributes_finder.rb b/lib/gitlab/import_export/attributes_finder.rb index 3439ef1006e..d230de781d5 100644 --- a/lib/gitlab/import_export/attributes_finder.rb +++ b/lib/gitlab/import_export/attributes_finder.rb @@ -2,9 +2,10 @@ module Gitlab module ImportExport class AttributesFinder - def initialize(included_attributes:, excluded_attributes:) + def initialize(included_attributes:, excluded_attributes:, methods:) @included_attributes = included_attributes || {} @excluded_attributes = excluded_attributes || {} + @methods = methods || {} end def find(model_object) @@ -27,10 +28,15 @@ module Gitlab @excluded_attributes[key].nil? ? {} : { except: @excluded_attributes[key] } end + def find_method(value) + key = key_from_hash(value) + @methods[key].nil? ? {} : { methods: @methods[key] } + end + private def find_attributes_only(value) - find_included(value).merge(find_excluded(value)) + find_included(value).merge(find_excluded(value)).merge(find_method(value)) end def key_from_hash(value) |