1 files changed, 1 insertions, 8 deletions
diff --git a/lib/gitlab/diff/file_collection/merge_request_diff_base.rb b/lib/gitlab/diff/file_collection/merge_request_diff_base.rb
index 692186fc323..b459e3f6619 100644
--- a/lib/gitlab/diff/file_collection/merge_request_diff_base.rb
+++ b/lib/gitlab/diff/file_collection/merge_request_diff_base.rb
@@ -13,7 +13,7 @@ module Gitlab
 
           super(merge_request_diff,
             project: merge_request_diff.project,
-            diff_options: merged_diff_options(diff_options),
+            diff_options: diff_options,
             diff_refs: merge_request_diff.diff_refs,
             fallback_diff_refs: merge_request_diff.fallback_diff_refs)
         end
@@ -68,13 +68,6 @@ module Gitlab
             diff_stats_cache.read || super
           end
         end
-
-        def merged_diff_options(diff_options)
-          project = @merge_request_diff.project
-          max_diff_options = ::Commit.max_diff_options(project: project).merge(project: project)
-
-          diff_options.present? ? diff_options.merge(max_diff_options) : max_diff_options
-        end
       end
     end
   end