Add latest changes from gitlab-org/gitlab@master

4 files changed, 17 insertions, 14 deletions

diff --git a/app/models/ci/build_dependencies.rb b/app/models/ci/build_dependencies.rb
index b5d67ef8e96..d3ff870e36a 100644
--- a/app/models/ci/build_dependencies.rb
+++ b/app/models/ci/build_dependencies.rb
@@ -67,7 +67,6 @@ module Ci
     end
 
     def from_needs(scope)
-      return scope unless Feature.enabled?(:ci_dag_support, project, default_enabled: true)
       return scope unless processable.scheduling_type_dag?
 
       needs_names = processable.needs.artifacts.select(:name)
diff --git a/app/models/ci/processable.rb b/app/models/ci/processable.rb
index 55518f32316..4bc8f26ec92 100644
--- a/app/models/ci/processable.rb
+++ b/app/models/ci/processable.rb
@@ -25,8 +25,6 @@ module Ci
     end
 
     def self.select_with_aggregated_needs(project)
-      return all unless Feature.enabled?(:ci_dag_support, project, default_enabled: true)
-
       aggregated_needs_names = Ci::BuildNeed
         .scoped_build
         .select("ARRAY_AGG(name)")
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 2edb1a45100..b9acb539404 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -555,22 +555,28 @@ class MergeRequest < ApplicationRecord
     end
   end
 
+  def diff_stats
+    return unless diff_refs
+
+    strong_memoize(:diff_stats) do
+      project.repository.diff_stats(diff_refs.base_sha, diff_refs.head_sha)
+    end
+  end
+
   def diff_size
     # Calling `merge_request_diff.diffs.real_size` will also perform
     # highlighting, which we don't need here.
-    merge_request_diff&.real_size || diffs.real_size
+    merge_request_diff&.real_size || diff_stats&.real_size || diffs.real_size
   end
 
   def modified_paths(past_merge_request_diff: nil)
-    diffs = if past_merge_request_diff
-              past_merge_request_diff
-            elsif compare
-              compare
-            else
-              self.merge_request_diff
-            end
-
-    diffs.modified_paths
+    if past_merge_request_diff
+      past_merge_request_diff.modified_paths
+    elsif compare
+      diff_stats&.paths || compare.modified_paths
+    else
+      merge_request_diff.modified_paths
+    end
   end
 
   def new_paths
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 821de70f9d9..dbf600cf0df 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -267,7 +267,7 @@ class Snippet < ApplicationRecord
   def repository_size_checker
     strong_memoize(:repository_size_checker) do
       ::Gitlab::RepositorySizeChecker.new(
-        current_size_proc: -> { repository._uncached_size.megabytes },
+        current_size_proc: -> { repository.size.megabytes },
         limit: Gitlab::CurrentSettings.snippet_size_limit
       )
     end