diff options
Diffstat (limited to 'app/controllers/projects/merge_requests/diffs_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests/diffs_controller.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/app/controllers/projects/merge_requests/diffs_controller.rb b/app/controllers/projects/merge_requests/diffs_controller.rb index c88dbc70ed5..83377f67723 100644 --- a/app/controllers/projects/merge_requests/diffs_controller.rb +++ b/app/controllers/projects/merge_requests/diffs_controller.rb @@ -60,17 +60,11 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic options[:merge_conflicts_in_diff] ] - if Feature.enabled?(:check_etags_diffs_batch_before_write_cache, merge_request.project) && !stale?(etag: [cache_context + diff_options_hash.fetch(:paths, []), diffs]) - return - end + return unless stale?(etag: [cache_context + diff_options_hash.fetch(:paths, []), diffs]) diffs.unfold_diff_files(unfoldable_positions) diffs.write_cache - if Feature.disabled?(:check_etags_diffs_batch_before_write_cache, merge_request.project) && !stale?(etag: [cache_context + diff_options_hash.fetch(:paths, []), diffs]) - return - end - render json: PaginatedDiffSerializer.new(current_user: current_user).represent(diffs, options) end # rubocop: enable Metrics/AbcSize |