diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-07-07 18:05:34 -0400 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-07-07 18:05:34 -0400 |
commit | 5a8f727fd5400634a99eae82e7bac5e26cf36d4e (patch) | |
tree | dde30050a8992e4ba0b5d3f0e98794d1f6089df8 /app/helpers/diff_helper.rb | |
parent | d925aea9f388f8ca5c858e825e5303232fa16c1d (diff) | |
parent | 86d238e4bda6424a79eb9d8ea7cfe41af714f49f (diff) | |
download | gitlab-ce-5a8f727fd5400634a99eae82e7bac5e26cf36d4e.tar.gz |
Merge branch 'master' into faster-diffs
# Conflicts:
# app/helpers/notes_helper.rb
# app/views/projects/diffs/_line.html.haml
# app/views/projects/diffs/_parallel_view.html.haml
# app/views/projects/diffs/_text_file.html.haml
# features/steps/shared/diff_note.rb
Diffstat (limited to 'app/helpers/diff_helper.rb')
-rw-r--r-- | app/helpers/diff_helper.rb | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index a282a67020f..b61266465e2 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -30,12 +30,8 @@ module DiffHelper options end - def safe_diff_files(diffs, diff_refs) - diffs.decorate! { |diff| Gitlab::Diff::File.new(diff, diff_refs) } - end - - def generate_line_code(file_path, line) - Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos) + def safe_diff_files(diffs, diff_refs: nil, repository: nil) + diffs.decorate! { |diff| Gitlab::Diff::File.new(diff, diff_refs: diff_refs, repository: repository) } end def unfold_bottom_class(bottom) @@ -93,6 +89,8 @@ module DiffHelper end def commit_for_diff(diff_file) + return diff_file.content_commit if diff_file.content_commit + if diff_file.deleted_file @base_commit || @commit.parent || @commit else @@ -100,10 +98,11 @@ module DiffHelper end end - def diff_file_html_data(project, diff_commit, diff_file) + def diff_file_html_data(project, diff_file) + commit = commit_for_diff(diff_file) { blob_diff_path: namespace_project_blob_diff_path(project.namespace, project, - tree_join(diff_commit.id, diff_file.file_path)) + tree_join(commit.id, diff_file.file_path)) } end |