Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.browserslistrc

@@ -1,18 +1,12 @@
 #
 # This list of browsers is a conservative definition, based on
-# https://docs.gitlab.com/ee/install/requirements.html#supported-web-browsers. We
-# also use the following reasoning to choose the target versions:
-#
-# - Actual Browser usage on gitlab.com
-# - Support second latest version of Firefox ESR
-# - Support Chrome / Edge versions about the same age as the Firefox ESR version chosen
-#
-# If need be we raise versions closer to the actual supported web browsers.
-#
-# See also this epic: https://gitlab.com/groups/gitlab-org/-/epics/3957
-#
-chrome >= 103
-edge >= 103
-firefox >= 102
-safari >= 15.6
+# https://docs.gitlab.com/ee/install/requirements.html#supported-web-browsers.
+# 
+# To see what browsers this targets, go here:
+# https://browsersl.ist/#q=%3E+0.5%25%2C+last+2+versions%2C+Firefox+ESR%2C+not+dead
+# 
 
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead

.rubocop_todo/gitlab/feature_flag_without_actor.yml

@@ -143,7 +143,6 @@ Gitlab/FeatureFlagWithoutActor:
     - 'ee/lib/search/zoekt/circuit_breaker.rb'
     - 'ee/spec/lib/gitlab/product_analytics/developments/setup_spec.rb'
     - 'ee/spec/models/gitlab_subscriptions/features_spec.rb'
-    - 'lib/api/features.rb'
     - 'lib/api/helpers/packages/dependency_proxy_helpers.rb'
     - 'lib/api/integrations.rb'
     - 'lib/api/internal/base.rb'

.rubocop_todo/layout/line_end_string_concatenation_indentation.yml

@@ -162,7 +162,6 @@ Layout/LineEndStringConcatenationIndentation:
     - 'ee/lib/api/iterations.rb'
     - 'ee/lib/api/protected_environments.rb'
     - 'ee/lib/api/vulnerability_findings.rb'
-    - 'ee/lib/ee/api/features.rb'
     - 'ee/lib/ee/api/helpers/groups_helpers.rb'
     - 'ee/lib/ee/gitlab/auth/ldap/access.rb'
     - 'ee/lib/ee/gitlab/auth/o_auth/user.rb'
@@ -344,7 +343,6 @@ Layout/LineEndStringConcatenationIndentation:
     - 'lib/api/ci/runners.rb'
     - 'lib/api/error_tracking/project_settings.rb'
     - 'lib/api/feature_flags_user_lists.rb'
-    - 'lib/api/features.rb'
     - 'lib/api/freeze_periods.rb'
     - 'lib/api/groups.rb'
     - 'lib/api/issue_links.rb'

.rubocop_todo/style/guard_clause.yml

@@ -307,7 +307,6 @@ Style/GuardClause:
     - 'ee/db/geo/migrate/20180314175612_add_partial_index_to_project_registy_verification_failure_columns.rb'
     - 'ee/db/geo/migrate/20180315222132_add_partial_index_to_project_registy_checksum_columns.rb'
     - 'ee/db/geo/migrate/20180412213305_add_index_to_artifact_id_on_job_artifact_registry.rb'
-    - 'ee/lib/ee/api/features.rb'
     - 'ee/lib/ee/api/helpers/projects_helpers.rb'
     - 'ee/lib/ee/api/projects.rb'
     - 'ee/lib/ee/gitlab/auth/ldap/access.rb'

.rubocop_todo/style/inline_disable_annotation.yml

@@ -1705,7 +1705,6 @@ Style/InlineDisableAnnotation:
     - 'lib/api/entities/project_details.rb'
     - 'lib/api/entities/project_integration.rb'
     - 'lib/api/entities/project_with_access.rb'
-    - 'lib/api/features.rb'
     - 'lib/api/group_boards.rb'
     - 'lib/api/groups.rb'
     - 'lib/api/helm_packages.rb'

GITALY_SERVER_VERSION

@@ -1 +1 @@
-9aea54d16acab5377a7e0488411f6fb066788570
+555d6e8568136f22dfe61dd3bdc58979e1097a3c

app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue

@@ -53,7 +53,7 @@ const i18n = {
 
 export default {
   i18n,
-  formElementClasses: 'gl-mr-3 gl-mb-3 gl-basis-1/4 gl-shrink-0 gl-flex-grow-0',
+  formElementClasses: 'gl-basis-1/4 gl-shrink-0 gl-flex-grow-0',
   // this height value is used inline on the textarea to match the input field height
   // it's used to prevent the overwrite if 'gl-h-7' or '!gl-h-7' were used
   textAreaStyle: { height: '32px' },
@@ -462,16 +462,16 @@ export default {
       />
     </gl-form-group>
 
-    <gl-loading-icon v-if="isLoading" class="gl-mb-5" size="lg" />
+    <gl-loading-icon v-if="isLoading" class="gl-mb-5" size="md" />
 
-    <gl-form-group v-else class="gl-mb-3" :label="s__('Pipeline|Variables')">
+    <gl-form-group v-else :label="s__('Pipeline|Variables')">
       <div
         v-for="(variable, index) in variables"
         :key="variable.uniqueId"
-        class="gl-mb-3 gl-pb-2"
+        class="gl-mb-4"
         data-testid="ci-variable-row-container"
       >
-        <div class="gl-flex gl-flex-col gl-items-stretch md:gl-flex-row">
+        <div class="gl-flex gl-flex-col gl-items-stretch gl-gap-4 md:gl-flex-row">
           <gl-collapsible-listbox
             :items="variableTypeListboxItems"
             :selected="variable.variable_type"
@@ -501,7 +501,6 @@ export default {
             v-else
             v-model="variable.value"
             :placeholder="s__('CiVariables|Input variable value')"
-            class="gl-mb-3"
             :style="$options.textAreaStyle"
             :no-resize="false"
             data-testid="pipeline-form-ci-variable-value-field"
@@ -510,24 +509,25 @@ export default {
           <template v-if="variables.length > 1">
             <gl-button
               v-if="canRemove(index)"
-              class="gl-mb-3 md:gl-ml-3"
+              size="small"
+              class="gl-shrink-0"
               data-testid="remove-ci-variable-row"
               :category="removeButtonCategory"
               :aria-label="$options.i18n.removeVariableLabel"
               @click="removeVariable(index)"
             >
               <gl-icon class="!gl-mr-0" name="remove" />
-              <span class="gl-ml-2 md:gl-hidden">{{ $options.i18n.removeVariableLabel }}</span>
+              <span class="md:gl-hidden">{{ $options.i18n.removeVariableLabel }}</span>
             </gl-button>
             <gl-button
               v-else
-              class="gl-invisible gl-mb-3 gl-hidden md:gl-ml-3 md:gl-block"
+              class="gl-invisible gl-hidden gl-shrink-0 md:gl-block"
               icon="remove"
               :aria-label="$options.i18n.removeVariableLabel"
             />
           </template>
         </div>
-        <div v-if="descriptions[variable.key]" class="gl-mb-3 gl-text-subtle">
+        <div v-if="descriptions[variable.key]" class="gl-text-subtle">
           {{ descriptions[variable.key] }}
         </div>
       </div>

app/assets/javascripts/environments/components/deploy_board.vue

@@ -8,30 +8,24 @@
  * - Button Actions.
  * [Mockup](https://gitlab.com/gitlab-org/gitlab-foss/uploads/2f655655c0eadf655d0ae7467b53002a/environments__deploy-graphic.png)
  */
-import {
-  GlIcon,
-  GlLoadingIcon,
-  GlLink,
-  GlTooltip,
-  GlTooltipDirective,
-  GlSprintf,
-} from '@gitlab/ui';
+import { GlLoadingIcon, GlLink, GlTooltip, GlTooltipDirective, GlSprintf } from '@gitlab/ui';
 import { isEmpty } from 'lodash';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import { s__, n__ } from '~/locale';
 import InstanceComponent from '~/vue_shared/components/deployment_instance.vue';
+import HelpIcon from '~/vue_shared/components/help_icon/help_icon.vue';
 import { STATUS_MAP, CANARY_STATUS } from '../constants';
 import CanaryIngress from './canary_ingress.vue';
 
 export default {
   components: {
     InstanceComponent,
     CanaryIngress,
-    GlIcon,
     GlLoadingIcon,
     GlLink,
     GlSprintf,
     GlTooltip,
+    HelpIcon,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -154,7 +148,7 @@ export default {
                 >{{ instanceTitle }} ({{ instanceCount }})</span
               >
               <span ref="legend-icon" data-testid="legend-tooltip-target">
-                <gl-icon class="gl-ml-2" name="question-o" variant="info" />
+                <help-icon class="gl-ml-2" />
               </span>
               <gl-tooltip :target="() => $refs['legend-icon']" boundary="#content-body">
                 <div class="deploy-board-legend gl-flex gl-flex-col">

app/assets/javascripts/feature_flags/components/strategy.vue

@@ -3,6 +3,7 @@
 import { GlAlert, GlButton, GlFormSelect, GlFormGroup, GlIcon, GlLink, GlToken } from '@gitlab/ui';
 import { isNumber } from 'lodash';
 import { s__, __ } from '~/locale';
+import HelpIcon from '~/vue_shared/components/help_icon/help_icon.vue';
 import {
   EMPTY_PARAMETERS,
   STRATEGY_SELECTIONS,
@@ -23,6 +24,7 @@ export default {
     GlToken,
     NewEnvironmentsDropdown,
     StrategyParameters,
+    HelpIcon,
   },
   inject: {
     strategyTypeDocsPagePath: {
@@ -139,7 +141,7 @@ export default {
             <template #description>
               {{ $options.i18n.strategyTypeDescription }}
               <gl-link :href="strategyTypeDocsPagePath" target="_blank">
-                <gl-icon name="question-o" />
+                <help-icon />
               </gl-link>
             </template>
             <gl-form-select

app/assets/javascripts/ide/components/commit_sidebar/message_field.vue

@@ -1,12 +1,13 @@
 <script>
-import { GlIcon, GlPopover } from '@gitlab/ui';
+import { GlPopover } from '@gitlab/ui';
 import { __, sprintf } from '~/locale';
+import HelpIcon from '~/vue_shared/components/help_icon/help_icon.vue';
 import { MAX_TITLE_LENGTH, MAX_BODY_LENGTH } from '../../constants';
 
 export default {
   components: {
-    GlIcon,
     GlPopover,
+    HelpIcon,
   },
   props: {
     text: {
@@ -81,8 +82,8 @@ export default {
           <li>
             {{ __('Commit Message') }}
             <div id="ide-commit-message-popover-container">
-              <span id="ide-commit-message-question" class="form-text gl-ml-3 gl-text-subtle">
-                <gl-icon name="question-o" />
+              <span id="ide-commit-message-question" class="form-text gl-ml-3">
+                <help-icon />
               </span>
               <gl-popover
                 target="ide-commit-message-question"