diff options
author | Felipe Artur <felipefac@gmail.com> | 2018-07-04 18:34:41 +0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2018-07-04 18:34:41 +0300 |
commit | 6d41df507143f87e33f335bc8c405a006a7f8a8d (patch) | |
tree | 054f21647b480638d7497b6e4f7f814c0fb9064b /app/serializers/diff_file_entity.rb | |
parent | d66bbf82b31b60c26646955c61e6a934b89d8a69 (diff) |
Render LegacyDiffNote when diff_file blob is nil
Diffstat (limited to 'app/serializers/diff_file_entity.rb')
-rw-r--r-- | app/serializers/diff_file_entity.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/serializers/diff_file_entity.rb b/app/serializers/diff_file_entity.rb index aa289a96975..61135fba97b 100644 --- a/app/serializers/diff_file_entity.rb +++ b/app/serializers/diff_file_entity.rb @@ -25,6 +25,8 @@ class DiffFileEntity < Grape::Entity expose :can_modify_blob do |diff_file| merge_request = options[:merge_request] + next unless diff_file.blob + if merge_request&.source_project && current_user can_modify_blob?(diff_file.blob, merge_request.source_project, merge_request.source_branch) else @@ -108,6 +110,7 @@ class DiffFileEntity < Grape::Entity project = merge_request.target_project next unless project + next unless diff_file.content_sha project_blob_path(project, tree_join(diff_file.content_sha, diff_file.new_path)) end @@ -125,6 +128,8 @@ class DiffFileEntity < Grape::Entity end expose :context_lines_path, if: -> (diff_file, _) { diff_file.text? } do |diff_file| + next unless diff_file.content_sha + project_blob_diff_path(diff_file.repository.project, tree_join(diff_file.content_sha, diff_file.file_path)) end |