diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 00:09:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 00:09:07 +0000 |
commit | e144369009f3404072f7e0f969f7cded93195a01 (patch) | |
tree | d7a354e2c3c69a7ad65dc81aba8fe2ba59b0a26f /lib/gitlab/diff | |
parent | d466ee5042520ad078fe050cb078d81dc2ebe196 (diff) | |
download | gitlab-ce-e144369009f3404072f7e0f969f7cded93195a01.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/diff')
-rw-r--r-- | lib/gitlab/diff/suggestion_diff.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/diff/suggestion_diff.rb b/lib/gitlab/diff/suggestion_diff.rb index ee153c226b7..783264fe999 100644 --- a/lib/gitlab/diff/suggestion_diff.rb +++ b/lib/gitlab/diff/suggestion_diff.rb @@ -18,7 +18,7 @@ module Gitlab private def raw_diff - "#{diff_header}\n#{from_content_as_diff}#{to_content_as_diff}" + "#{diff_header}\n#{from_content_as_diff}\n#{to_content_as_diff}" end def diff_header @@ -26,7 +26,7 @@ module Gitlab end def from_content_as_diff - from_content.lines.map { |line| line.prepend('-') }.join + from_content.lines.map { |line| line.prepend('-') }.join.delete_suffix("\n") end def to_content_as_diff |