Add latest changes from gitlab-org/gitlab@master

6 files changed, 16 insertions, 17 deletions

diff --git a/app/assets/javascripts/clusters/agents/components/activity_events_list.vue b/app/assets/javascripts/clusters/agents/components/activity_events_list.vue
index 6567ce203bc..d996da259f5 100644
--- a/app/assets/javascripts/clusters/agents/components/activity_events_list.vue
+++ b/app/assets/javascripts/clusters/agents/components/activity_events_list.vue
@@ -28,17 +28,17 @@ export default {
   },
   i18n: {
     emptyText: s__(
-      'ClusterAgents|See Agent activity updates such as tokens created or revoked and clusters connected or not connected.',
+      'ClusterAgents|See agent activity updates, like tokens created or revoked and clusters connected or not connected.',
     ),
-    emptyTooltip: s__('ClusterAgents|What is GitLab Agent activity?'),
+    emptyTooltip: s__('ClusterAgents|What is agent activity?'),
     error: s__(
-      'ClusterAgents|An error occurred while retrieving GitLab Agent activity. Reload the page to try again.',
+      'ClusterAgents|An error occurred while retrieving agent activity. Reload the page to try again.',
     ),
     today: __('Today'),
     yesterday: __('Yesterday'),
   },
-  emptyHelpLink: helpPagePath('user/clusters/agent/install/index', {
-    anchor: 'view-agent-activity',
+  emptyHelpLink: helpPagePath('user/clusters/agent/work_with_agent', {
+    anchor: 'view-an-agents-activity-information',
   }),
   borderClasses: 'gl-border-b-1 gl-border-b-solid gl-border-b-gray-100',
   apollo: {
@@ -68,8 +68,8 @@ export default {
     },
     emptyStateTitle() {
       return n__(
-        "ClusterAgents|There's no activity from the past day",
-        "ClusterAgents|There's no activity from the past %d days",
+        'ClusterAgents|No activity occurred in the past day',
+        'ClusterAgents|No activity occurred in the past %d days',
         EVENTS_STORED_DAYS,
       );
     },
diff --git a/app/assets/javascripts/diffs/components/diff_expansion_cell.vue b/app/assets/javascripts/diffs/components/diff_expansion_cell.vue
index cd726818031..4e7dc578193 100644
--- a/app/assets/javascripts/diffs/components/diff_expansion_cell.vue
+++ b/app/assets/javascripts/diffs/components/diff_expansion_cell.vue
@@ -238,7 +238,7 @@ export default {
       >
         <button
           v-if="showExpandDown"
-          v-gl-tooltip
+          v-gl-tooltip.left
           :title="s__('Diffs|Next 20 lines')"
           type="button"
           class="js-unfold-down gl-rounded-0 gl-border-0 diff-line-expand-button"
@@ -249,7 +249,7 @@ export default {
         </button>
         <button
           v-if="lineCountBetween !== -1 && lineCountBetween < 20"
-          v-gl-tooltip
+          v-gl-tooltip.left
           :title="s__('Diffs|Expand all lines')"
           type="button"
           class="js-unfold-all gl-rounded-0 gl-border-0 diff-line-expand-button"
@@ -260,7 +260,7 @@ export default {
         </button>
         <button
           v-if="showExpandUp"
-          v-gl-tooltip
+          v-gl-tooltip.left
           :title="s__('Diffs|Previous 20 lines')"
           type="button"
           class="js-unfold gl-rounded-0 gl-border-0 diff-line-expand-button"
diff --git a/app/assets/javascripts/issues/show/components/app.vue b/app/assets/javascripts/issues/show/components/app.vue
index 456a2029703..999c67b8560 100644
--- a/app/assets/javascripts/issues/show/components/app.vue
+++ b/app/assets/javascripts/issues/show/components/app.vue
@@ -510,7 +510,7 @@ export default {
               class="issue-sticky-header-text gl-display-flex gl-align-items-center gl-mx-auto gl-px-5"
             >
               <p
-                class="issuable-status-box status-box gl-my-0"
+                class="issuable-status-box status-box gl-white-space-nowrap gl-my-0"
                 :class="[isClosed ? 'status-box-issue-closed' : 'status-box-open']"
               >
                 <gl-icon :name="statusIcon" class="gl-display-block d-sm-none gl-h-6!" />
diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js
index 3e1c471f015..3eb19a41d02 100644
--- a/app/assets/javascripts/projects/project_new.js
+++ b/app/assets/javascripts/projects/project_new.js
@@ -286,9 +286,6 @@ const bindEvents = () => {
   });
 
   $('.js-import-git-toggle-button').on('click', () => {
-    const $projectMirror = $('#project_mirror');
-
-    $projectMirror.attr('disabled', !$projectMirror.attr('disabled'));
     setProjectNamePathHandlers(
       $('.tab-pane.active #project_name'),
       $('.tab-pane.active #project_path'),
diff --git a/app/assets/javascripts/security_configuration/components/feature_card.vue b/app/assets/javascripts/security_configuration/components/feature_card.vue
index 309e5f21445..19b412d66ca 100644
--- a/app/assets/javascripts/security_configuration/components/feature_card.vue
+++ b/app/assets/javascripts/security_configuration/components/feature_card.vue
@@ -119,8 +119,10 @@ export default {
         />
 
         <template v-if="enabled">
-          <gl-icon name="check-circle-filled" />
-          <span class="gl-text-green-700">{{ $options.i18n.enabled }}</span>
+          <span>
+            <gl-icon name="check-circle-filled" />
+            <span class="gl-text-green-700">{{ $options.i18n.enabled }}</span>
+          </span>
         </template>
 
         <template v-else-if="available">
diff --git a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_title.vue b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_title.vue
index 45941174a62..47f05a2cee2 100644
--- a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_title.vue
+++ b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_title.vue
@@ -86,7 +86,7 @@ export default {
           >
             <p
               data-testid="status"
-              class="issuable-status-box status-box gl-my-0"
+              class="issuable-status-box status-box gl-white-space-nowrap gl-my-0"
               :class="statusBadgeClass"
             >
               <gl-icon :name="statusIcon" class="gl-display-block d-sm-none gl-h-6!" />