diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-09 15:08:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-09 15:08:17 +0300 |
| commit | 0e26adf3e663234407a431f6e5eea9255440f4a3 (patch) | |
| tree | 35b024671e78842713192684084feb29f58a1532 /app/assets/javascripts/projects | |
| parent | 3834f7913d10b1e549b0c16bf12cd35dd5c97bb4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/projects')
| -rw-r--r-- | app/assets/javascripts/projects/settings/access_dropdown.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/projects/settings/components/access_dropdown.vue | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/projects/settings/access_dropdown.js b/app/assets/javascripts/projects/settings/access_dropdown.js index 79dfa166b1a..060178a3cfb 100644 --- a/app/assets/javascripts/projects/settings/access_dropdown.js +++ b/app/assets/javascripts/projects/settings/access_dropdown.js @@ -441,11 +441,13 @@ export default class AccessDropdown { const { id, fingerprint, + fingerprint_sha256: fingerprintSha256, title, owner: { avatar_url, name, username }, } = response; - const shortFingerprint = `(${fingerprint.substring(0, 14)}...)`; + const availableFingerprint = fingerprintSha256 || fingerprint; + const shortFingerprint = `(${availableFingerprint.substring(0, 14)}...)`; return { id, diff --git a/app/assets/javascripts/projects/settings/components/access_dropdown.vue b/app/assets/javascripts/projects/settings/components/access_dropdown.vue index a24eb1f5b20..fcf81c9d1f7 100644 --- a/app/assets/javascripts/projects/settings/components/access_dropdown.vue +++ b/app/assets/javascripts/projects/settings/components/access_dropdown.vue @@ -203,11 +203,13 @@ export default { const { id, fingerprint, + fingerprint_sha256: fingerprintSha256, title, owner: { avatar_url, name, username }, } = response; - const shortFingerprint = `(${fingerprint.substring(0, 14)}...)`; + const availableFingerprint = fingerprintSha256 || fingerprint; + const shortFingerprint = `(${availableFingerprint.substring(0, 14)}...)`; return { id, @@ -387,7 +389,7 @@ export default { }}</gl-dropdown-section-header> <gl-dropdown-item v-for="key in deployKeys" - :key="`${key.id}${key.fingerprint}`" + :key="`${key.id}-{key.title}`" data-testid="deploy_key-dropdown-item" is-check-item :is-checked="isSelected(key)" |