diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-30 16:00:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-30 16:00:33 +0300 |
| commit | e11efedcfcd80b2d55a1bdd17b317cef82ce0a0e (patch) | |
| tree | dd176669205ad33e6b7e7e19068695af130e7a41 /lib/gitlab/import_export | |
| parent | 5ba663860c0d90a17657b0cbb53ac582bf7edd43 (diff) | |
Add latest changes from gitlab-org/security/gitlab@16-5-stable-ee
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/command_line_util.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_export/project/relation_factory.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/command_line_util.rb b/lib/gitlab/import_export/command_line_util.rb index dfe0815f0a0..ea91b01afdb 100644 --- a/lib/gitlab/import_export/command_line_util.rb +++ b/lib/gitlab/import_export/command_line_util.rb @@ -141,7 +141,7 @@ module Gitlab raise HardLinkError, 'File shares hard link' if Gitlab::Utils::FileInfo.shares_hard_link?(filepath) - FileUtils.rm(filepath) if Gitlab::Utils::FileInfo.linked?(filepath) + FileUtils.rm(filepath) if Gitlab::Utils::FileInfo.linked?(filepath) || File.pipe?(filepath) end true diff --git a/lib/gitlab/import_export/project/relation_factory.rb b/lib/gitlab/import_export/project/relation_factory.rb index 943c997a056..8e34a6d73ba 100644 --- a/lib/gitlab/import_export/project/relation_factory.rb +++ b/lib/gitlab/import_export/project/relation_factory.rb @@ -81,6 +81,8 @@ module Gitlab private + attr_reader :relation_hash, :user + def invalid_relation? # Do not create relation if it is a legacy trigger legacy_trigger? |