Class: Projects::MergeRequests::DiffsController

Inherits:
ApplicationController
  • Object
show all
Includes:
DiffHelper, Gitlab::Cache::Helpers, Gitlab::Tracking::Helpers, RendersNotes
Defined in:
app/controllers/projects/merge_requests/diffs_controller.rb

Constant Summary

Constants included from Gitlab::Cache::Helpers

Gitlab::Cache::Helpers::DEFAULT_EXPIRY

Instance Method Summary collapse

Methods included from Gitlab::Tracking::Helpers

#dnt_enabled?, #trackable_html_request?

Methods included from Gitlab::Cache::Helpers

#cache, #render_cached

Methods included from RendersNotes

#prepare_notes_for_rendering

Methods included from DiffHelper

#apply_diff_view_cookie!, #collapsed_diff_url, #conflicts, #diff_file_blob_raw_path, #diff_file_blob_raw_url, #diff_file_html_data, #diff_file_old_blob_raw_path, #diff_file_old_blob_raw_url, #diff_file_stats_data, #diff_line_content, #diff_link_number, #diff_match_line, #diff_nomappinginraw_line, #diff_options, #diff_view, #diffs_expanded?, #editable_diff?, #inline_diff_btn, #mark_inline_diffs, #parallel_diff_btn, #parallel_diff_discussions, #params_with_whitespace, #render_fork_suggestion, #render_overflow_warning?, #show_only_context_commits?, #submodule_diff_compare_link, #submodule_link

Instance Method Details

#diff_for_path ⇒ Object 



29
30
31
 
# File 'app/controllers/projects/merge_requests/diffs_controller.rb', line 29

def diff_for_path
  render_diffs
end

#diffs_batch ⇒ Object

rubocop: disable Metrics/AbcSize



34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
 
# File 'app/controllers/projects/merge_requests/diffs_controller.rb', line 34

def diffs_batch
  diff_options_hash = diff_options
  diff_options_hash[:paths] = params[:paths] if params[:paths]

  diffs = @compare.diffs_in_batch(params[:page], params[:per_page], diff_options: diff_options_hash)

  unfoldable_positions = Gitlab::Metrics.measure(:diffs_unfoldable_positions) do
    @merge_request.note_positions_for_paths(diffs.diff_file_paths, current_user).unfoldable
  end

  options = {
    merge_request: @merge_request,
    commit: commit,
    diff_view: diff_view,
    merge_ref_head_diff: render_merge_ref_head_diff?,
    pagination_data: diffs.pagination_data
  }

  # NOTE: Any variables that would affect the resulting json needs to be added to the cache_context
  #   to avoid stale cache issues.
  cache_context = [
    current_user&.cache_key,
    unfoldable_positions.map(&:to_h),
    diff_view,
    params[:w],
    params[:expanded],
    params[:page],
    params[:per_page],
    options[:merge_ref_head_diff]
  ]

  expires_in(1.day) if cache_with_max_age?

  return unless stale?(etag: [cache_context + diff_options_hash.fetch(:paths, []), diffs])

  Gitlab::Metrics.measure(:diffs_unfold) do
    diffs.unfold_diff_files(unfoldable_positions)
  end

  Gitlab::Metrics.measure(:diffs_write_cache) do
    diffs.write_cache
  end

  Gitlab::Metrics.measure(:diffs_render) do
    render json: PaginatedDiffSerializer.new(current_user: current_user).represent(diffs, options)
  end
end

#diffs_metadata ⇒ Object

rubocop: enable Metrics/AbcSize



83
84
85
86
87
88
89
90
91
92
93
 
# File 'app/controllers/projects/merge_requests/diffs_controller.rb', line 83

def diffs_metadata
  diffs = @compare.diffs(diff_options)

  options = additional_attributes.merge(
    only_context_commits: show_only_context_commits?,
    merge_ref_head_diff: render_merge_ref_head_diff?
  )

  render json: DiffsMetadataSerializer.new(project: @merge_request.project, current_user: current_user)
                 .represent(diffs, options)
end

#show ⇒ Object 



25
26
27
 
# File 'app/controllers/projects/merge_requests/diffs_controller.rb', line 25

def show
  render_diffs
end