1 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/commit_message_dropdown.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/commit_message_dropdown.vue
index b6722de5277..73d75352cb5 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/commit_message_dropdown.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/commit_message_dropdown.vue
@@ -25,12 +25,13 @@ export default {
       class="mr-commit-dropdown"
     >
       <gl-dropdown-item
-        v-for="commit in commits"
-        :key="commit.short_id"
+        v-for="(commit, index) in commits"
+        :key="index"
         class="text-nowrap text-truncate"
         @click="$emit('input', commit.message)"
       >
-        <span class="monospace mr-2">{{ commit.short_id }}</span> {{ commit.title }}
+        <span class="monospace mr-2">{{ commit.shortId || commit.short_id }}</span>
+        {{ commit.title }}
       </gl-dropdown-item>
     </gl-dropdown>
   </div>