diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-12 03:10:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-12 03:10:38 +0300 |
| commit | e57da6ba898df025f93bf8d3a896c7c2ba2ab830 (patch) | |
| tree | 0eb1feedb28db1bbf9a695aae76b025a65105404 /app/assets/javascripts/vue_shared/components | |
| parent | 23790cda2b4145294d71591515acfe892d4c99a7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components')
3 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue b/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue index ba557878246..7871721f38b 100644 --- a/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue +++ b/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue @@ -283,7 +283,6 @@ export default { <gl-disclosure-dropdown-item v-if="isOpen && canUpdateMergeRequest" - data-testid="close-merge-request" @action="stateAction('close')" > <template #list-item> diff --git a/app/assets/javascripts/vue_shared/components/notes/noteable_warning.vue b/app/assets/javascripts/vue_shared/components/notes/noteable_warning.vue index 9ea04553536..9179331cdec 100644 --- a/app/assets/javascripts/vue_shared/components/notes/noteable_warning.vue +++ b/app/assets/javascripts/vue_shared/components/notes/noteable_warning.vue @@ -69,7 +69,7 @@ export default { }; </script> <template> - <div class="issuable-note-warning" data-testid="confidential-warning"> + <div class="issuable-note-warning"> <gl-icon v-if="!isLockedAndConfidential" :name="warningIcon" :size="16" class="icon inline" /> <span v-if="isLockedAndConfidential" ref="lockedAndConfidential"> diff --git a/app/assets/javascripts/vue_shared/components/registry/title_area.vue b/app/assets/javascripts/vue_shared/components/registry/title_area.vue index 9cb16bb6ef6..2db56343210 100644 --- a/app/assets/javascripts/vue_shared/components/registry/title_area.vue +++ b/app/assets/javascripts/vue_shared/components/registry/title_area.vue @@ -41,6 +41,9 @@ export default { created() { this.recalculateMetadataSlots(); }, + updated() { + this.recalculateMetadataSlots(); + }, methods: { recalculateMetadataSlots() { const METADATA_PREFIX = 'metadata-'; |