gitlab-org--gitlab-foss/app/controllers/concerns/diff_for_path.rb
Adam Niedzielski 3fa265d195 Fix expanding a collapsed diff when converting a symlink to a regular file
In this case comparing old_path and new_path is not enough because there
are two entires that match.
2016-11-10 18:24:12 +01:00

24 lines
572 B
Ruby

module DiffForPath
extend ActiveSupport::Concern
def render_diff_for_path(diffs)
diff_file = diffs.diff_files.find do |diff|
diff.file_identifier == params[:file_identifier]
end
return render_404 unless diff_file
diff_commit = commit_for_diff(diff_file)
blob = diff_file.blob(diff_commit)
locals = {
diff_file: diff_file,
diff_commit: diff_commit,
diff_refs: diffs.diff_refs,
blob: blob,
project: project
}
render json: { html: view_to_html_string('projects/diffs/_content', locals) }
end
end