diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 15:40:28 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 15:40:28 +0000 |
commit | b595cb0c1dec83de5bdee18284abe86614bed33b (patch) | |
tree | 8c3d4540f193c5ff98019352f554e921b3a41a72 /app/assets/javascripts/admin | |
parent | 2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff) | |
download | gitlab-ce-b595cb0c1dec83de5bdee18284abe86614bed33b.tar.gz |
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to 'app/assets/javascripts/admin')
3 files changed, 35 insertions, 30 deletions
diff --git a/app/assets/javascripts/admin/deploy_keys/components/table.vue b/app/assets/javascripts/admin/deploy_keys/components/table.vue index 29e8b9a724e..46e7ac3cf28 100644 --- a/app/assets/javascripts/admin/deploy_keys/components/table.vue +++ b/app/assets/javascripts/admin/deploy_keys/components/table.vue @@ -35,8 +35,12 @@ export default { label: __('Title'), }, { + key: 'fingerprint_sha256', + label: __('Fingerprint (SHA256)'), + }, + { key: 'fingerprint', - label: __('Fingerprint'), + label: __('Fingerprint (MD5)'), }, { key: 'projects', @@ -130,10 +134,18 @@ export default { } this.items = items.map( - ({ id, title, fingerprint, projects_with_write_access, created_at }) => ({ + ({ id, title, fingerprint, + fingerprint_sha256, + projects_with_write_access, + created_at, + }) => ({ + id, + title, + fingerprint, + fingerprint_sha256, projects: projects_with_write_access, created: created_at, }), @@ -196,8 +208,12 @@ export default { > </template> + <template #cell(fingerprint_sha256)="{ item: { fingerprint_sha256 } }"> + <span v-if="fingerprint_sha256" class="monospace">{{ fingerprint_sha256 }}</span> + </template> + <template #cell(fingerprint)="{ item: { fingerprint } }"> - <code>{{ fingerprint }}</code> + <span v-if="fingerprint" class="monospace">{{ fingerprint }}</span> </template> <template #cell(created)="{ item: { created } }"> diff --git a/app/assets/javascripts/admin/statistics_panel/components/app.vue b/app/assets/javascripts/admin/statistics_panel/components/app.vue index f250bdae4f5..347d5f0229c 100644 --- a/app/assets/javascripts/admin/statistics_panel/components/app.vue +++ b/app/assets/javascripts/admin/statistics_panel/components/app.vue @@ -1,10 +1,11 @@ <script> -import { GlLoadingIcon } from '@gitlab/ui'; +import { GlCard, GlLoadingIcon } from '@gitlab/ui'; import { mapState, mapGetters, mapActions } from 'vuex'; import statisticsLabels from '../constants'; export default { components: { + GlCard, GlLoadingIcon, }, data() { @@ -26,20 +27,14 @@ export default { </script> <template> - <div class="gl-card"> - <div class="gl-card-body"> - <h4>{{ __('Statistics') }}</h4> - <gl-loading-icon v-if="isLoading" size="lg" class="my-3" /> - <template v-else> - <p - v-for="statistic in getStatistics(statisticsLabels)" - :key="statistic.key" - class="js-stats" - > - {{ statistic.label }} - <span class="light float-right">{{ statistic.value }}</span> - </p> - </template> - </div> - </div> + <gl-card> + <h4>{{ __('Statistics') }}</h4> + <gl-loading-icon v-if="isLoading" size="lg" class="my-3" /> + <template v-else> + <p v-for="statistic in getStatistics(statisticsLabels)" :key="statistic.key" class="js-stats"> + {{ statistic.label }} + <span class="light float-right">{{ statistic.value }}</span> + </p> + </template> + </gl-card> </template> diff --git a/app/assets/javascripts/admin/users/components/user_actions.vue b/app/assets/javascripts/admin/users/components/user_actions.vue index 40e5f8d9d70..691a292673c 100644 --- a/app/assets/javascripts/admin/users/components/user_actions.vue +++ b/app/assets/javascripts/admin/users/components/user_actions.vue @@ -94,13 +94,13 @@ export default { :data-testid="`user-actions-${user.id}`" > <div v-if="hasEditAction" class="gl-p-2"> - <gl-button v-if="showButtonLabels" v-bind="editButtonAttrs">{{ + <gl-button v-if="showButtonLabels" v-bind="editButtonAttrs" icon="pencil-square">{{ $options.i18n.edit }}</gl-button> <gl-button v-else v-gl-tooltip="$options.i18n.edit" - icon="pencil" + icon="pencil-square" v-bind="editButtonAttrs" :aria-label="$options.i18n.edit" /> @@ -108,18 +108,12 @@ export default { <div v-if="hasDropdownActions" class="gl-p-2"> <gl-dropdown - v-gl-tooltip="$options.i18n.userAdministration" + :text="$options.i18n.userAdministration" data-testid="dropdown-toggle" - icon="ellipsis_v" data-qa-selector="user_actions_dropdown_toggle" :data-qa-username="user.username" - no-caret - right + left > - <gl-dropdown-section-header>{{ - $options.i18n.userAdministration - }}</gl-dropdown-section-header> - <template v-for="action in dropdownSafeActions"> <component :is="getActionComponent(action)" |