Add latest changes from gitlab-org/gitlab@master

5 files changed, 14 insertions, 2 deletions

diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index 2fc8b9efc1b..de10d5397df 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -506,6 +506,8 @@ export class AwardsHandler {
     const options = {
       scrollTop: $('.awards').offset().top - 110,
     };
+
+    // eslint-disable-next-line no-jquery/no-animate
     return $('body, html').animate(options, 200);
   }
 
diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
index ab1e5f92698..7db9898396b 100644
--- a/app/assets/javascripts/clusters/components/application_row.vue
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -290,6 +290,7 @@ export default {
       disabled && 'cluster-application-disabled',
     ]"
     class="cluster-application-row gl-responsive-table-row gl-responsive-table-row-col-span"
+    :data-qa-selector="id"
   >
     <div class="gl-responsive-table-row-layout" role="row">
       <div class="table-section append-right-8 section-align-top" role="gridcell">
@@ -381,12 +382,16 @@ export default {
             :disabled="disabled || installButtonDisabled"
             :label="installButtonLabel"
             class="js-cluster-application-install-button"
+            data-qa-selector="install_button"
+            :data-qa-application="id"
             @click="installClicked"
           />
           <uninstall-application-button
             v-if="displayUninstallButton"
             v-gl-modal-directive="'uninstall-' + id"
             :status="status"
+            data-qa-selector="uninstall_button"
+            :data-qa-application="id"
             class="js-cluster-application-uninstall-button"
           />
           <uninstall-application-confirmation-modal
diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js
index e4001e94478..71f73cd5420 100644
--- a/app/assets/javascripts/lib/utils/common_utils.js
+++ b/app/assets/javascripts/lib/utils/common_utils.js
@@ -135,7 +135,9 @@ export const handleLocationHash = () => {
     adjustment -= topPadding;
   }
 
-  window.scrollBy(0, adjustment);
+  setTimeout(() => {
+    window.scrollBy(0, adjustment);
+  });
 };
 
 // Check if element scrolled into viewport from above or below
@@ -247,6 +249,7 @@ export const scrollToElement = element => {
   }
   const { top } = $el.offset();
 
+  // eslint-disable-next-line no-jquery/no-animate
   return $('body, html').animate(
     {
       scrollTop: top - contentTop(),
diff --git a/app/assets/javascripts/monitoring/components/shared/prometheus_header.vue b/app/assets/javascripts/monitoring/components/shared/prometheus_header.vue
index 153c8f389db..ceeec51ee65 100644
--- a/app/assets/javascripts/monitoring/components/shared/prometheus_header.vue
+++ b/app/assets/javascripts/monitoring/components/shared/prometheus_header.vue
@@ -10,6 +10,6 @@ export default {
 </script>
 <template>
   <div class="prometheus-graph-header">
-    <h5 class="prometheus-graph-title js-graph-title">{{ graphTitle }}</h5>
+    <h5 ref="title" class="prometheus-graph-title">{{ graphTitle }}</h5>
   </div>
 </template>
diff --git a/app/assets/javascripts/pages/admin/admin.js b/app/assets/javascripts/pages/admin/admin.js
index 4616a075729..88967d82b2f 100644
--- a/app/assets/javascripts/pages/admin/admin.js
+++ b/app/assets/javascripts/pages/admin/admin.js
@@ -36,6 +36,8 @@ export default function adminInit() {
   $('.log-bottom').on('click', e => {
     e.preventDefault();
     const $visibleLog = $('.file-content:visible');
+
+    // eslint-disable-next-line no-jquery/no-animate
     $visibleLog.animate(
       {
         scrollTop: $visibleLog.find('ol').height(),