diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-10-04 03:44:14 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-10-04 03:44:14 +0300 |
| commit | 5381985bd012562696637122b1dcd067480a94d3 (patch) | |
| tree | 7e05baefc2df32f6ef324cae755de6294c89c92f /app/serializers | |
| parent | 9c13a512f4a836d2d0d61dc4fbbc6fd8f76aa474 (diff) | |
| parent | dfb9ac3a5f97a4c556bacea78174836fe7d39145 (diff) | |
Merge branch 'master-ce' into scheduled-manual-jobs
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 |