diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-24 18:06:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-24 18:06:02 +0300 |
| commit | 8db8e2a34205c67e358cf544745d9eaeb30cd032 (patch) | |
| tree | abfd747d94a4a77e0dfac5ac29cd7b57343edff9 /app/serializers/merge_request_diff_entity.rb | |
| parent | 33813f993b49da58426d33a148ee70952e6835bb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers/merge_request_diff_entity.rb')
| -rw-r--r-- | app/serializers/merge_request_diff_entity.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/serializers/merge_request_diff_entity.rb b/app/serializers/merge_request_diff_entity.rb index 7e3053e5881..5c79b165ee9 100644 --- a/app/serializers/merge_request_diff_entity.rb +++ b/app/serializers/merge_request_diff_entity.rb @@ -21,6 +21,8 @@ class MergeRequestDiffEntity < Grape::Entity expose :latest?, as: :latest expose :short_commit_sha do |merge_request_diff| + next unless merge_request_diff.head_commit_sha + short_sha(merge_request_diff.head_commit_sha) end |