summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-12-31 08:48:44 -0800
committerStan Hu <stanhu@gmail.com>2018-12-31 09:18:29 -0800
commitef304611ad93f9ce9ff6555109292d94476ad52a (patch)
tree1e64b685c5a2548e171a433460e2e86290022f81 /app/assets/javascripts
parent4d875a2bc365d1c5eb9c0965f91e688efae1e143 (diff)
downloadgitlab-ce-ef304611ad93f9ce9ff6555109292d94476ad52a.tar.gz
Fix commit SHA not showing in merge request compare dropdown
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17011 in GitLab 11.1 refactored the merge request diff comparison functionality but omitted the commit SHA due to a change in the API (truncated_commit_sha -> short_commit_sha). Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55822
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/diffs/components/compare_versions_dropdown.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue b/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
index 8da02ed0b7c..b9b1ee02697 100644
--- a/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
+++ b/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
@@ -129,7 +129,7 @@ export default {
</strong>
</div>
<div>
- <small class="commit-sha"> {{ version.truncated_commit_sha }} </small>
+ <small class="commit-sha"> {{ version.short_commit_sha }} </small>
</div>
<div>
<small>