Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 3 deletions

diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb
index 8e130998f11..c914819f79d 100644
--- a/app/models/container_repository.rb
+++ b/app/models/container_repository.rb
@@ -145,9 +145,14 @@ class ContainerRepository < ApplicationRecord
              name: path.repository_name)
   end
 
-  def self.create_from_path!(path)
-    safe_find_or_create_by!(project: path.repository_project,
-                                 name: path.repository_name)
+  def self.find_or_create_from_path(path)
+    repository = safe_find_or_create_by(
+      project: path.repository_project,
+      name: path.repository_name
+    )
+    return repository if repository.persisted?
+
+    find_by_path!(path)
   end
 
   def self.build_root_repository(project)