Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 10 deletions

diff --git a/app/assets/javascripts/deploy_keys/components/app.vue b/app/assets/javascripts/deploy_keys/components/app.vue
index 922c907bb36..fd45e098758 100644
--- a/app/assets/javascripts/deploy_keys/components/app.vue
+++ b/app/assets/javascripts/deploy_keys/components/app.vue
@@ -133,7 +133,7 @@ export default {
         :keys="keys[currentTab]"
         :store="store"
         :endpoint="endpoint"
-        class="qa-project-deploy-keys"
+        data-qa-selector="project_deploy_keys"
       />
     </template>
   </div>
diff --git a/app/assets/javascripts/registry/list/components/collapsible_container.vue b/app/assets/javascripts/registry/list/components/collapsible_container.vue
index 5a6f9370564..86bb2d8092e 100644
--- a/app/assets/javascripts/registry/list/components/collapsible_container.vue
+++ b/app/assets/javascripts/registry/list/components/collapsible_container.vue
@@ -31,7 +31,7 @@ export default {
     GlTooltip: GlTooltipDirective,
     GlModal: GlModalDirective,
   },
-  mixins: [Tracking.mixin({})],
+  mixins: [Tracking.mixin()],
   props: {
     repo: {
       type: Object,
@@ -43,7 +43,6 @@ export default {
       isOpen: false,
       modalId: `confirm-repo-deletion-modal-${this.repo.id}`,
       tracking: {
-        category: document.body.dataset.page,
         label: 'registry_repository_delete',
       },
     };
@@ -67,7 +66,7 @@ export default {
       }
     },
     handleDeleteRepository() {
-      this.track('confirm_delete', {});
+      this.track('confirm_delete');
       return this.deleteItem(this.repo)
         .then(() => {
           createFlash(__('This container registry has been scheduled for deletion.'), 'notice');
@@ -103,7 +102,7 @@ export default {
           :aria-label="s__('ContainerRegistry|Remove repository')"
           class="js-remove-repo btn-inverted"
           variant="danger"
-          @click="track('click_button', {})"
+          @click="track('click_button')"
         >
           <icon name="remove" />
         </gl-button>
@@ -132,7 +131,7 @@ export default {
       :modal-id="modalId"
       ok-variant="danger"
       @ok="handleDeleteRepository"
-      @cancel="track('cancel_delete', {})"
+      @cancel="track('cancel_delete')"
     >
       <template v-slot:modal-title>{{ s__('ContainerRegistry|Remove repository') }}</template>
       <p
diff --git a/app/assets/javascripts/registry/list/components/table_registry.vue b/app/assets/javascripts/registry/list/components/table_registry.vue
index 682c511a1ae..e682a0e0019 100644
--- a/app/assets/javascripts/registry/list/components/table_registry.vue
+++ b/app/assets/javascripts/registry/list/components/table_registry.vue
@@ -23,7 +23,7 @@ export default {
   directives: {
     GlTooltip: GlTooltipDirective,
   },
-  mixins: [timeagoMixin],
+  mixins: [timeagoMixin, Tracking.mixin()],
   props: {
     repo: {
       type: Object,
@@ -71,9 +71,6 @@ export default {
   },
   methods: {
     ...mapActions(['fetchList', 'deleteItem', 'multiDeleteItems']),
-    track(action) {
-      Tracking.event(document.body.dataset.page, action, this.tracking);
-    },
     setModalDescription(itemIndex = -1) {
       if (itemIndex === -1) {
         this.modalDescription = sprintf(