gitlab-org--gitlab-foss/app/controllers/projects/merge_requests/diffs_controller.rb

81 lines
2.2 KiB
Ruby
Raw Normal View History

2017-06-13 18:12:31 -04:00
class Projects::MergeRequests::DiffsController < Projects::MergeRequests::ApplicationController
include DiffForPath
include DiffHelper
include RendersNotes
before_action :apply_diff_view_cookie!
2017-11-14 11:48:40 -05:00
before_action :commit
2017-06-13 18:12:31 -04:00
before_action :define_diff_vars
before_action :define_diff_comment_vars
def show
@environment = @merge_request.environments_for(current_user).last
render json: { html: view_to_html_string("projects/merge_requests/diffs/_diffs") }
2017-06-13 18:12:31 -04:00
end
def diff_for_path
render_diff_for_path(@diffs)
end
private
def define_diff_vars
@merge_request_diffs = @merge_request.merge_request_diffs.viewable.order_id_desc
@compare = commit || find_merge_request_diff_compare
return render_404 unless @compare
@diffs = @compare.diffs(diff_options)
end
2017-11-14 11:48:40 -05:00
def commit
return nil unless commit_id = params[:commit_id].presence
return nil unless @merge_request.all_commits.exists?(sha: commit_id)
2017-11-14 11:48:40 -05:00
@commit ||= @project.commit(commit_id)
end
def find_merge_request_diff_compare
2017-06-13 18:12:31 -04:00
@merge_request_diff =
if diff_id = params[:diff_id].presence
@merge_request.merge_request_diffs.viewable.find_by(id: diff_id)
2017-06-13 18:12:31 -04:00
else
@merge_request.merge_request_diff
end
return unless @merge_request_diff
2017-06-13 18:12:31 -04:00
@comparable_diffs = @merge_request_diffs.select { |diff| diff.id < @merge_request_diff.id }
if @start_sha = params[:start_sha].presence
2017-06-13 18:12:31 -04:00
@start_version = @comparable_diffs.find { |diff| diff.head_commit_sha == @start_sha }
unless @start_version
@start_sha = @merge_request_diff.head_commit_sha
@start_version = @merge_request_diff
end
end
if @start_sha
@merge_request_diff.compare_with(@start_sha)
else
@merge_request_diff
end
2017-06-13 18:12:31 -04:00
end
def define_diff_comment_vars
@new_diff_note_attrs = {
noteable_type: 'MergeRequest',
noteable_id: @merge_request.id,
commit_id: @commit&.id
2017-06-13 18:12:31 -04:00
}
@diff_notes_disabled = false
@use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?
@grouped_diff_discussions = @merge_request.grouped_diff_discussions(@compare.diff_refs)
@notes = prepare_notes_for_rendering(@grouped_diff_discussions.values.flatten.flat_map(&:notes), @merge_request)
2017-06-13 18:12:31 -04:00
end
end