diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-03 20:54:04 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-03 20:54:04 +0000 |
| commit | dfb9ac3a5f97a4c556bacea78174836fe7d39145 (patch) | |
| tree | 4ca307bce38dae6d4f37c6db232e7a5bd3e1b8cd /app/serializers | |
| parent | 5ed4716a14b9a3abd184c8503e6a1e492806d8de (diff) | |
| parent | 8aedb71c4900021ca74e188873278ac40356f40e (diff) | |
| download | gitlab-ce-dfb9ac3a5f97a4c556bacea78174836fe7d39145.tar.gz | |
Merge branch '_acet-fix-diff-file-header' into 'master'
Fix showing diff file header for renamed files
Closes #48887
See merge request gitlab-org/gitlab-ce!22089
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/diff_file_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/diff_file_entity.rb b/app/serializers/diff_file_entity.rb index cbe6f200b86..c193ed10fef 100644 --- a/app/serializers/diff_file_entity.rb +++ b/app/serializers/diff_file_entity.rb @@ -84,7 +84,7 @@ class DiffFileEntity < Grape::Entity end expose :old_path_html do |diff_file| - old_path = mark_inline_diffs(diff_file.old_path, diff_file.new_path) + old_path, _ = mark_inline_diffs(diff_file.old_path, diff_file.new_path) old_path end |