diff options
| author | Long Nguyen <long.polyglot@gmail.com> | 2016-05-21 17:21:07 +0700 |
|---|---|---|
| committer | Long Nguyen <long.polyglot@gmail.com> | 2016-05-21 17:21:07 +0700 |
| commit | b11cf8996ac00e58e662f9383caa113af860ce9c (patch) | |
| tree | 88f47270a82cb1783a79f55ded71775385598682 /app/helpers/diff_helper.rb | |
| parent | bfbbb182c14441ad176b6c7b0ec9e9f38da25ae4 (diff) | |
| parent | aa060e68ee004ac0175682afd30357a26129c0de (diff) | |
| download | gitlab-ce-b11cf8996ac00e58e662f9383caa113af860ce9c.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_17479_todos_not_remove_when_leave_project
Diffstat (limited to 'app/helpers/diff_helper.rb')
| -rw-r--r-- | app/helpers/diff_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index 5f311f3780a..ea383f9b0f6 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -2,8 +2,8 @@ module DiffHelper def mark_inline_diffs(old_line, new_line) old_diffs, new_diffs = Gitlab::Diff::InlineDiff.new(old_line, new_line).inline_diffs - marked_old_line = Gitlab::Diff::InlineDiffMarker.new(old_line).mark(old_diffs) - marked_new_line = Gitlab::Diff::InlineDiffMarker.new(new_line).mark(new_diffs) + marked_old_line = Gitlab::Diff::InlineDiffMarker.new(old_line).mark(old_diffs, mode: :deletion) + marked_new_line = Gitlab::Diff::InlineDiffMarker.new(new_line).mark(new_diffs, mode: :addition) [marked_old_line, marked_new_line] end |