Add latest changes from gitlab-org/gitlab@master

2 files changed, 25 insertions, 21 deletions

diff --git a/app/assets/javascripts/ml/experiment_tracking/routes/experiments/index/components/ml_experiments_index.vue b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/index/components/ml_experiments_index.vue
index 66f94c6bee5..b543169d501 100644
--- a/app/assets/javascripts/ml/experiment_tracking/routes/experiments/index/components/ml_experiments_index.vue
+++ b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/index/components/ml_experiments_index.vue
@@ -51,27 +51,29 @@ export default {
 </script>
 
 <template>
-  <div v-if="hasExperiments">
+  <div>
     <model-experiments-header :page-title="$options.i18n.TITLE_LABEL" />
 
-    <gl-table-lite :items="tableItems" :fields="$options.tableFields">
-      <template #cell(nameColumn)="data">
-        <gl-link :href="data.value.path">
-          {{ data.value.name }}
-        </gl-link>
-      </template>
-    </gl-table-lite>
+    <template v-if="hasExperiments">
+      <gl-table-lite :items="tableItems" :fields="$options.tableFields">
+        <template #cell(nameColumn)="data">
+          <gl-link :href="data.value.path">
+            {{ data.value.name }}
+          </gl-link>
+        </template>
+      </gl-table-lite>
 
-    <pagination v-if="hasExperiments" v-bind="pageInfo" />
-  </div>
+      <pagination v-if="hasExperiments" v-bind="pageInfo" />
+    </template>
 
-  <gl-empty-state
-    v-else
-    :title="$options.i18n.EMPTY_STATE_TITLE_LABEL"
-    :primary-button-text="$options.i18n.CREATE_NEW_LABEL"
-    :primary-button-link="$options.constants.CREATE_EXPERIMENT_HELP_PATH"
-    :svg-path="emptyStateSvgPath"
-    :description="$options.i18n.EMPTY_STATE_DESCRIPTION_LABEL"
-    class="gl-py-8"
-  />
+    <gl-empty-state
+      v-else
+      :title="$options.i18n.EMPTY_STATE_TITLE_LABEL"
+      :primary-button-text="$options.i18n.CREATE_NEW_LABEL"
+      :primary-button-link="$options.constants.CREATE_EXPERIMENT_HELP_PATH"
+      :svg-path="emptyStateSvgPath"
+      :description="$options.i18n.EMPTY_STATE_DESCRIPTION_LABEL"
+      class="gl-py-8"
+    />
+  </div>
 </template>
diff --git a/app/assets/javascripts/ml/experiment_tracking/routes/experiments/index/translations.js b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/index/translations.js
index e954c054cf5..f556197633b 100644
--- a/app/assets/javascripts/ml/experiment_tracking/routes/experiments/index/translations.js
+++ b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/index/translations.js
@@ -4,8 +4,10 @@ export const TITLE_LABEL = s__('MlExperimentTracking|Model experiments');
 
 export const CREATE_NEW_LABEL = s__('MlExperimentTracking|Create a new experiment');
 
-export const EMPTY_STATE_TITLE_LABEL = s__('MlExperimentTracking|No experiments');
+export const EMPTY_STATE_TITLE_LABEL = s__(
+  'MlExperimentTracking|Get started with model experiments!',
+);
 
 export const EMPTY_STATE_DESCRIPTION_LABEL = s__(
-  'MlExperimentTracking|There are no logged experiments for this project. Create a new experiment using the MLflow client.',
+  'MlExperimentTracking|Experiments keep track of comparable model candidates, and determine which parameters provides the best performance. Create experiments using the MLflow client',
 );