Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
85a103fc
Commit
85a103fc
authored
Oct 03, 2019
by
Aleksei Lipniagov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop offences
parent
5d4c6c17
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
ee/lib/ee/gitlab/import_export/project_tree_restorer.rb
ee/lib/ee/gitlab/import_export/project_tree_restorer.rb
+3
-1
lib/gitlab/import_export/project_tree_restorer.rb
lib/gitlab/import_export/project_tree_restorer.rb
+3
-4
No files found.
ee/lib/ee/gitlab/import_export/project_tree_restorer.rb
View file @
85a103fc
...
...
@@ -11,7 +11,9 @@ module EE
override
:remove_feature_dependent_sub_relations
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'
)
end
end
...
...
lib/gitlab/import_export/project_tree_restorer.rb
View file @
85a103fc
...
...
@@ -36,9 +36,8 @@ module Gitlab
end
end
# ensure that we have latest version
# of the restore
@restored_project
=
@project
.
reload
# ensure that we have latest version of the restore
@restored_project
=
@project
.
reload
# rubocop:disable Cop/ActiveRecordAssociationReload
true
rescue
=>
e
...
...
@@ -95,7 +94,7 @@ module Gitlab
save_id_mappings
(
relation_key
,
relation_hash_batch
,
relation_hash
)
@project
.
reset
end
end
# Older, serialized CI pipeline exports may only have a
# merge_request_id and not the full hash of the merge request. To
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment