kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/controllers/concerns/diff_for_path.rb

25 lines
572 B
Ruby
Raw Normal View History

DRY up diff_for_path actions 1. Move render method to a concern, not a helper. 2. Let DiffHelper#diff_options automatically add the path option. 3. Move more instance var definitions to before filters.
2016-07-06 13:15:27 -04:00
module DiffForPath
extend ActiveSupport::Concern
Cache highlighted diff lines for merge requests Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
2016-07-20 12:25:36 -04:00
def render_diff_for_path(diffs)
diff_file = diffs.diff_files.find do |diff|
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 12:24:12 -05:00
diff.file_identifier == params[:file_identifier]
Handle more than two paths in MergeRequest#diffs
2016-07-11 13:17:00 -04:00
end
DRY up diff_for_path actions 1. Move render method to a concern, not a helper. 2. Let DiffHelper#diff_options automatically add the path option. 3. Move more instance var definitions to before filters.
2016-07-06 13:15:27 -04:00
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,
Cache highlighted diff lines for merge requests Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
2016-07-20 12:25:36 -04:00
diff_refs: diffs.diff_refs,
DRY up diff_for_path actions 1. Move render method to a concern, not a helper. 2. Let DiffHelper#diff_options automatically add the path option. 3. Move more instance var definitions to before filters.
2016-07-06 13:15:27 -04:00
blob: blob,
project: project
}
render json: { html: view_to_html_string('projects/diffs/_content', locals) }
end
end
Copy permalink