Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 19 deletions

diff --git a/app/assets/javascripts/sidebar/components/participants/participants.vue b/app/assets/javascripts/sidebar/components/participants/participants.vue
index 4a255a3b916..3fd35de2132 100644
--- a/app/assets/javascripts/sidebar/components/participants/participants.vue
+++ b/app/assets/javascripts/sidebar/components/participants/participants.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlIcon, GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui';
+import { GlButton, GlIcon, GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui';
 import { __, n__, sprintf } from '~/locale';
 import userAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue';
 
@@ -8,9 +8,10 @@ export default {
     GlTooltip: GlTooltipDirective,
   },
   components: {
-    userAvatarImage,
+    GlButton,
     GlIcon,
     GlLoadingIcon,
+    userAvatarImage,
   },
   props: {
     loading: {
@@ -124,9 +125,13 @@ export default {
       </div>
     </div>
     <div v-if="hasMoreParticipants" class="participants-more hide-collapsed">
-      <button type="button" class="btn-transparent btn-link" @click="toggleMoreParticipants">
-        {{ toggleLabel }}
-      </button>
+      <gl-button
+        variant="link"
+        button-text-classes="gl-text-secondary"
+        data-testid="more-participants"
+        @click="toggleMoreParticipants"
+        >{{ toggleLabel }}</gl-button
+      >
     </div>
   </div>
 </template>
diff --git a/app/assets/javascripts/terraform/components/empty_state.vue b/app/assets/javascripts/terraform/components/empty_state.vue
index fd9177bef3f..6dae55bac50 100644
--- a/app/assets/javascripts/terraform/components/empty_state.vue
+++ b/app/assets/javascripts/terraform/components/empty_state.vue
@@ -1,11 +1,16 @@
 <script>
-import { GlEmptyState, GlIcon, GlLink } from '@gitlab/ui';
+import { GlEmptyState, GlLink } from '@gitlab/ui';
+import { s__ } from '~/locale';
 import { helpPagePath } from '~/helpers/help_page_helper';
 
 export default {
+  i18n: {
+    title: s__("Terraform|Your project doesn't have any Terraform state files"),
+    description: s__('Terraform|How to use GitLab-managed Terraform state?'),
+  },
+  docsUrl: helpPagePath('user/infrastructure/iac/terraform_state'),
   components: {
     GlEmptyState,
-    GlIcon,
     GlLink,
   },
   props: {
@@ -14,23 +19,13 @@ export default {
       required: true,
     },
   },
-  computed: {
-    docsUrl() {
-      return helpPagePath('user/infrastructure/iac/terraform_state');
-    },
-  },
 };
 </script>
 
 <template>
-  <gl-empty-state :svg-path="image" :title="s__('Terraform|Get started with Terraform')">
+  <gl-empty-state :svg-path="image" :title="$options.i18n.title">
     <template #description>
-      <p>
-        <gl-link :href="docsUrl" target="_blank"
-          >{{ s__('Terraform|How to use GitLab-managed Terraform State?') }}
-          <gl-icon name="external-link"
-        /></gl-link>
-      </p>
+      <gl-link :href="$options.docsUrl">{{ $options.i18n.description }}</gl-link>
     </template>
   </gl-empty-state>
 </template>