summaryrefslogtreecommitdiff
path: root/app/models/merge_request_diff_file.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/merge_request_diff_file.rb')
-rw-r--r--app/models/merge_request_diff_file.rb7
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?