Commit 85a103fc authored by Aleksei Lipniagov's avatar Aleksei Lipniagov

Fix rubocop offences

parent 5d4c6c17
...@@ -11,7 +11,9 @@ module EE ...@@ -11,7 +11,9 @@ module EE
override :remove_feature_dependent_sub_relations override :remove_feature_dependent_sub_relations
def remove_feature_dependent_sub_relations(relation_item) def remove_feature_dependent_sub_relations(relation_item)
if relation_item.is_a?(Hash) && ::Feature.disabled?(:export_designs, @project, default_enabled: true) export_designs_disabled = ::Feature.disabled?(:export_designs, @project, default_enabled: true) # rubocop:disable Gitlab/ModuleWithInstanceVariables
if relation_item.is_a?(Hash) && export_designs_disabled
relation_item.except!('designs', 'design_versions') relation_item.except!('designs', 'design_versions')
end end
end end
......
...@@ -36,9 +36,8 @@ module Gitlab ...@@ -36,9 +36,8 @@ module Gitlab
end end
end end
# ensure that we have latest version # ensure that we have latest version of the restore
# of the restore @restored_project = @project.reload # rubocop:disable Cop/ActiveRecordAssociationReload
@restored_project = @project.reload
true true
rescue => e rescue => e
...@@ -95,7 +94,7 @@ module Gitlab ...@@ -95,7 +94,7 @@ module Gitlab
save_id_mappings(relation_key, relation_hash_batch, relation_hash) save_id_mappings(relation_key, relation_hash_batch, relation_hash)
@project.reset @project.reset
end end
# Older, serialized CI pipeline exports may only have a # Older, serialized CI pipeline exports may only have a
# merge_request_id and not the full hash of the merge request. To # merge_request_id and not the full hash of the merge request. To
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment