diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
| commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
| tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /app/models/merge_request_diff_file.rb | |
| parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) | |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'app/models/merge_request_diff_file.rb')
| -rw-r--r-- | app/models/merge_request_diff_file.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/models/merge_request_diff_file.rb b/app/models/merge_request_diff_file.rb index 04b322ef5a6..5a98131a6fd 100644 --- a/app/models/merge_request_diff_file.rb +++ b/app/models/merge_request_diff_file.rb @@ -15,12 +15,7 @@ class MergeRequestDiffFile < ApplicationRecord end def utf8_diff - fetched_diff = if Feature.enabled?(:externally_stored_diffs_caching_export) && - merge_request_diff&.stored_externally? - diff_export - else - diff - end + fetched_diff = merge_request_diff&.stored_externally? ? diff_export : diff return '' if fetched_diff.blank? |