diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-06 21:08:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-06 21:08:09 +0300 |
| commit | 1287690a3678ad0ec21c9b2f3b21ae18257d5e22 (patch) | |
| tree | 96162972275004dcaef6376fe324ee2a7a549833 /app/models | |
| parent | d4806ad7dbd2d87ae09872709fef1aef35792e21 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -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 |