Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

3 files changed, 10 insertions, 5 deletions

diff --git a/app/models/design_management/design.rb b/app/models/design_management/design.rb
index 57bb250829d..62e4bd6cebc 100644
--- a/app/models/design_management/design.rb
+++ b/app/models/design_management/design.rb
@@ -167,6 +167,10 @@ module DesignManagement
       end
     end
 
+    def self.build_full_path(issue, design)
+      File.join(DesignManagement.designs_directory, "issue-#{issue.iid}", design.filename)
+    end
+
     def to_ability_name
       'design'
     end
@@ -180,7 +184,7 @@ module DesignManagement
     end
 
     def full_path
-      @full_path ||= File.join(DesignManagement.designs_directory, "issue-#{issue.iid}", filename)
+      @full_path ||= self.class.build_full_path(issue, self)
     end
 
     def diff_refs
@@ -224,6 +228,10 @@ module DesignManagement
       !interloper.exists?
     end
 
+    def notes_with_associations
+      notes.includes(:author)
+    end
+
     private
 
     def head_version
diff --git a/app/models/design_management/design_at_version.rb b/app/models/design_management/design_at_version.rb
index b4cafb93c2c..211211144f4 100644
--- a/app/models/design_management/design_at_version.rb
+++ b/app/models/design_management/design_at_version.rb
@@ -21,10 +21,6 @@ module DesignManagement
       @design, @version = design, version
     end
 
-    def self.instantiate(attrs)
-      new(attrs).tap { |obj| obj.validate! }
-    end
-
     # The ID, needed by GraphQL types and as part of the Lazy-fetch
     # protocol, includes information about both the design and the version.
     #
diff --git a/app/models/design_management/design_collection.rb b/app/models/design_management/design_collection.rb
index c48b36588c9..6deba14a6ba 100644
--- a/app/models/design_management/design_collection.rb
+++ b/app/models/design_management/design_collection.rb
@@ -5,6 +5,7 @@ module DesignManagement
     attr_reader :issue
 
     delegate :designs, :project, to: :issue
+    delegate :empty?, to: :designs
 
     state_machine :copy_state, initial: :ready, namespace: :copy do
       after_transition any => any, do: :update_stored_copy_state!