diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /app/models/diff_viewer/server_side.rb | |
parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'app/models/diff_viewer/server_side.rb')
-rw-r--r-- | app/models/diff_viewer/server_side.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/diff_viewer/server_side.rb b/app/models/diff_viewer/server_side.rb index 0877c9dddec..a1defb2594f 100644 --- a/app/models/diff_viewer/server_side.rb +++ b/app/models/diff_viewer/server_side.rb @@ -10,6 +10,9 @@ module DiffViewer end def prepare! + return if Feature.enabled?(:disable_load_entire_blob_for_diff_viewer, diff_file.repository.project) + + # TODO: remove this after resolving #342703 diff_file.old_blob&.load_all_data! diff_file.new_blob&.load_all_data! end |