1 files changed, 21 insertions, 1 deletions
diff --git a/lib/api/entities/merge_request_changes.rb b/lib/api/entities/merge_request_changes.rb
index a835d119736..488f33dfb93 100644
--- a/lib/api/entities/merge_request_changes.rb
+++ b/lib/api/entities/merge_request_changes.rb
@@ -4,7 +4,27 @@ module API
   module Entities
     class MergeRequestChanges < MergeRequest
       expose :diffs, as: :changes, using: Entities::Diff do |compare, _|
-        compare.raw_diffs(limits: false).to_a
+        Array(diff_collection(compare))
+      end
+
+      expose :overflow?, as: :overflow
+
+      private
+
+      def overflow?
+        expose_raw_diffs? ? false : diff_collection(object).overflow?
+      end
+
+      def diff_collection(compare)
+        @diffs ||= if expose_raw_diffs?
+                     compare.raw_diffs(limits: false)
+                   else
+                     compare.diffs.diffs
+                   end
+      end
+
+      def expose_raw_diffs?
+        options[:access_raw_diffs] || ::Feature.enabled?(:mrc_api_use_raw_diffs_from_gitaly, options[:project])
       end
     end
   end