Add latest changes from gitlab-org/gitlab@master

.rubocop.yml

@@ -446,6 +446,7 @@ Gitlab/DocUrl:
     - danger/**/*
     - ee/spec/**/*
     - haml_lint/**/*
+    - keeps/**/*
     - qa/**/*
     - rubocop/**/*
     - scripts/**/*

.rubocop_todo/gitlab/strong_memoize_attr.yml

@@ -257,7 +257,6 @@ Gitlab/StrongMemoizeAttr:
     - 'ee/app/helpers/ee/ci/runners_helper.rb'
     - 'ee/app/helpers/ee/preferences_helper.rb'
     - 'ee/app/helpers/ee/timeboxes_helper.rb'
-    - 'ee/app/helpers/license_monitoring_helper.rb'
     - 'ee/app/helpers/subscriptions_helper.rb'
     - 'ee/app/helpers/trials_helper.rb'
     - 'ee/app/models/approval_merge_request_rule.rb'

.rubocop_todo/layout/extra_spacing.yml

@@ -2,10 +2,6 @@
 # Cop supports --autocorrect.
 Layout/ExtraSpacing:
   Exclude:
-    - 'app/finders/admin/plans_finder.rb'
-    - 'app/finders/autocomplete/users_finder.rb'
-    - 'app/graphql/mutations/commits/create.rb'
-    - 'app/graphql/types/ci/job_artifact_file_type_enum.rb'
     - 'ee/app/graphql/mutations/geo/registries/update.rb'
     - 'ee/app/models/epic_issue.rb'
     - 'ee/app/models/merge_request/predictions.rb'

.rubocop_todo/layout/line_length.yml

@@ -1428,7 +1428,6 @@ Layout/LineLength:
     - 'ee/spec/helpers/gitlab_subscriptions/upcoming_reconciliation_helper_spec.rb'
     - 'ee/spec/helpers/groups/security_features_helper_spec.rb'
     - 'ee/spec/helpers/license_helper_spec.rb'
-    - 'ee/spec/helpers/license_monitoring_helper_spec.rb'
     - 'ee/spec/helpers/notes_helper_spec.rb'
     - 'ee/spec/helpers/projects/on_demand_scans_helper_spec.rb'
     - 'ee/spec/helpers/projects/project_members_helper_spec.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -257,7 +257,6 @@ RSpec/ContextWording:
     - 'ee/spec/helpers/ee/personal_access_tokens_helper_spec.rb'
     - 'ee/spec/helpers/ee/projects/security/api_fuzzing_configuration_helper_spec.rb'
     - 'ee/spec/helpers/license_helper_spec.rb'
-    - 'ee/spec/helpers/license_monitoring_helper_spec.rb'
     - 'ee/spec/helpers/projects_helper_spec.rb'
     - 'ee/spec/helpers/roadmaps_helper_spec.rb'
     - 'ee/spec/helpers/security_helper_spec.rb'
@@ -402,7 +401,6 @@ RSpec/ContextWording:
     - 'ee/spec/models/ci/subscriptions/project_spec.rb'
     - 'ee/spec/models/concerns/approval_rule_like_spec.rb'
     - 'ee/spec/models/concerns/approver_migrate_hook_spec.rb'
-    - 'ee/spec/models/concerns/deprecated_approvals_before_merge_spec.rb'
     - 'ee/spec/models/concerns/ee/issuable_spec.rb'
     - 'ee/spec/models/concerns/ee/participable_spec.rb'
     - 'ee/spec/models/concerns/elastic/project_spec.rb'

.rubocop_todo/rspec/factory_bot/avoid_create.yml

@@ -52,7 +52,6 @@ RSpec/FactoryBot/AvoidCreate:
     - 'ee/spec/helpers/incident_management/escalation_policy_helper_spec.rb'
     - 'ee/spec/helpers/incident_management/oncall_schedule_helper_spec.rb'
     - 'ee/spec/helpers/license_helper_spec.rb'
-    - 'ee/spec/helpers/license_monitoring_helper_spec.rb'
     - 'ee/spec/helpers/manual_quarterly_co_term_banner_helper_spec.rb'
     - 'ee/spec/helpers/markup_helper_spec.rb'
     - 'ee/spec/helpers/notes_helper_spec.rb'

.rubocop_todo/rspec/feature_category.yml

@@ -405,7 +405,6 @@ RSpec/FeatureCategory:
     - 'ee/spec/helpers/groups/security_features_helper_spec.rb'
     - 'ee/spec/helpers/incident_management/oncall_schedule_helper_spec.rb'
     - 'ee/spec/helpers/kerberos_helper_spec.rb'
-    - 'ee/spec/helpers/license_monitoring_helper_spec.rb'
     - 'ee/spec/helpers/manual_quarterly_co_term_banner_helper_spec.rb'
     - 'ee/spec/helpers/markup_helper_spec.rb'
     - 'ee/spec/helpers/notes_helper_spec.rb'
@@ -785,7 +784,6 @@ RSpec/FeatureCategory:
     - 'ee/spec/models/commit_spec.rb'
     - 'ee/spec/models/compliance_management/compliance_framework/project_settings_spec.rb'
     - 'ee/spec/models/concerns/approver_migrate_hook_spec.rb'
-    - 'ee/spec/models/concerns/deprecated_approvals_before_merge_spec.rb'
     - 'ee/spec/models/concerns/ee/issuable_spec.rb'
     - 'ee/spec/models/concerns/ee/milestoneable_spec.rb'
     - 'ee/spec/models/concerns/ee/noteable_spec.rb'

Gemfile

@@ -240,9 +240,9 @@ gem 'diffy', '~> 3.4' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems/diff_match_patch', feature_category: :team_planning
 
 # Application server
-gem 'rack', '~> 2.2.8.1' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'rack', '~> 2.2.9' # rubocop:todo Gemfile/MissingFeatureCategory
 # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually
-gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory
 
 group :puma do
   gem 'puma', '= 6.4.0', require: false, feature_category: :shared

Gemfile.checksum

@@ -515,7 +515,7 @@
 {"name":"raabro","version":"1.4.0","platform":"ruby","checksum":"d4fa9ff5172391edb92b242eed8be802d1934b1464061ae5e70d80962c5da882"},
 {"name":"racc","version":"1.6.2","platform":"java","checksum":"0880781e7dfde09e665d0b6160b583e01ed52fcc2955d7891447d33c2d1d2cf1"},
 {"name":"racc","version":"1.6.2","platform":"ruby","checksum":"58d26b3666382396fea84d33dc0639b7ee8d704156a52f8f22681f07b2f94f26"},
-{"name":"rack","version":"2.2.8.1","platform":"ruby","checksum":"a7121de625e86133e0cdd03ff281642a712b628dee86eb8818db42432198b782"},
+{"name":"rack","version":"2.2.9","platform":"ruby","checksum":"fd6301a97a1c1e955e68f85c861fcb1cde6145a32c532e1ea321a72ff8cc4042"},
 {"name":"rack-accept","version":"0.4.5","platform":"ruby","checksum":"66247b5449db64ebb93ae2ec4af4764b87d1ae8a7463c7c68893ac13fa8d4da2"},
 {"name":"rack-attack","version":"6.7.0","platform":"ruby","checksum":"3ca47e8f66cd33b2c96af53ea4754525cd928ed3fa8da10ee6dad0277791d77c"},
 {"name":"rack-cors","version":"2.0.1","platform":"ruby","checksum":"bcc66bdf5c6a4af05d571c4d01d35ac4a873552ba4f86c05fbe39365c39b9b0a"},
@@ -524,7 +524,7 @@
 {"name":"rack-proxy","version":"0.7.7","platform":"ruby","checksum":"446a4b57001022145d5c3ba73b775f66a2260eaf7420c6907483141900395c8a"},
 {"name":"rack-session","version":"1.0.2","platform":"ruby","checksum":"a02115e5420b4de036839b9811e3f7967d73446a554b42aa45106af335851d76"},
 {"name":"rack-test","version":"2.1.0","platform":"ruby","checksum":"0c61fc61904049d691922ea4bb99e28004ed3f43aa5cfd495024cc345f125dfb"},
-{"name":"rack-timeout","version":"0.6.3","platform":"ruby","checksum":"1754892eacc124d405e7f1145731ec9b7421ebd1bee5d51ddc18b72c204d0ab3"},
+{"name":"rack-timeout","version":"0.7.0","platform":"ruby","checksum":"757337e9793cca999bb73a61fe2a7d4280aa9eefbaf787ce3b98d860749c87d9"},
 {"name":"rails","version":"7.0.8.4","platform":"ruby","checksum":"7e418423a57ffde4466422f0afab676fbd8f23a7b47f5431fb38ab3dda9765eb"},
 {"name":"rails-controller-testing","version":"1.0.5","platform":"ruby","checksum":"741448db59366073e86fc965ba403f881c636b79a2c39a48d0486f2607182e94"},
 {"name":"rails-dom-testing","version":"2.0.3","platform":"ruby","checksum":"b140c4f39f6e609c8113137b9a60dfc2ecb89864e496f87f23a68b3b8f12d8d1"},

Gemfile.lock

@@ -1407,7 +1407,7 @@ GEM
     pyu-ruby-sasl (0.0.3.3)
     raabro (1.4.0)
     racc (1.6.2)
-    rack (2.2.8.1)
+    rack (2.2.9)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (6.7.0)
@@ -1428,7 +1428,7 @@ GEM
       rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rack-timeout (0.6.3)
+    rack-timeout (0.7.0)
     rails (7.0.8.4)
       actioncable (= 7.0.8.4)
       actionmailbox (= 7.0.8.4)
@@ -2166,12 +2166,12 @@ DEPENDENCIES
   pry-rails (~> 0.3.9)
   pry-shell (~> 0.6.4)
   puma (= 6.4.0)
-  rack (~> 2.2.8.1)
+  rack (~> 2.2.9)
   rack-attack (~> 6.7.0)
   rack-cors (~> 2.0.1)
   rack-oauth2 (~> 1.21.3)
   rack-proxy (~> 0.7.7)
-  rack-timeout (~> 0.6.3)
+  rack-timeout (~> 0.7.0)
   rails (~> 7.0.8.4)
   rails-controller-testing
   rails-i18n (~> 7.0, >= 7.0.9)

app/assets/javascripts/admin/deploy_keys/components/table.vue

@@ -9,8 +9,10 @@ import {
   GlTooltipDirective,
 } from '@gitlab/ui';
 
+import { VIEW_ADMIN_DEPLOY_KEYS_PAGELOAD } from '~/admin/deploy_keys/constants';
 import { __ } from '~/locale';
 import Api, { DEFAULT_PER_PAGE } from '~/api';
+import { InternalEvents } from '~/tracking';
 import CrudComponent from '~/vue_shared/components/crud_component.vue';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import { cleanLeadingSeparator } from '~/lib/utils/url_utility';
@@ -98,6 +100,7 @@ export default {
   directives: {
     GlTooltip: GlTooltipDirective,
   },
+  mixins: [InternalEvents.mixin()],
   inject: ['editPath', 'deletePath', 'createPath', 'emptyStateSvgPath'],
   data() {
     return {
@@ -127,6 +130,7 @@ export default {
     },
   },
   mounted() {
+    this.trackEvent(VIEW_ADMIN_DEPLOY_KEYS_PAGELOAD);
     this.fetchDeployKeys();
   },
   methods: {

app/assets/javascripts/admin/deploy_keys/constants.js

@@ -0,0 +1 @@
+export const VIEW_ADMIN_DEPLOY_KEYS_PAGELOAD = 'view_admin_deploy_keys_pageload';

app/assets/javascripts/content_editor/components/bubble_menus/reference_bubble_menu.vue

@@ -9,6 +9,7 @@ import { __ } from '~/locale';
 import Reference from '../../extensions/reference';
 import ReferenceLabel from '../../extensions/reference_label';
 import EditorStateObserver from '../editor_state_observer.vue';
+import { REFERENCE_TYPES } from '../../constants/reference_types';
 import BubbleMenu from './bubble_menu.vue';
 
 const REFERENCE_NODE_TYPES = [Reference.name, ReferenceLabel.name];
@@ -43,40 +44,46 @@ export default {
     };
   },
   computed: {
+    isWorkItem() {
+      return this.referenceType === REFERENCE_TYPES.WORK_ITEM;
+    },
     isIssue() {
-      return this.referenceType === 'issue';
+      return this.referenceType === REFERENCE_TYPES.ISSUE;
     },
     isMergeRequest() {
-      return this.referenceType === 'merge_request';
+      return this.referenceType === REFERENCE_TYPES.MERGE_REQUEST;
     },
     isEpic() {
-      return this.referenceType === 'epic';
+      return this.referenceType === REFERENCE_TYPES.EPIC;
     },
     isExpandable() {
-      return this.isIssue || this.isMergeRequest || this.isEpic;
+      return this.isIssue || this.isWorkItem || this.isMergeRequest || this.isEpic;
+    },
+    showSummary() {
+      return !this.isEpic;
     },
     textFormats() {
       return [
         {
           value: '',
-          text: this.$options.i18n.referenceId[this.referenceType],
+          text: this.$options.i18n.referenceId,
           matcher: (text) => !text.endsWith('+') && !text.endsWith('+s'),
           getText: () => this.text,
           shouldShow: true,
         },
         {
           value: '+',
-          text: this.$options.i18n.referenceTitle[this.referenceType],
+          text: this.$options.i18n.referenceTitle,
           matcher: (text) => text.endsWith('+'),
           getText: () => this.expandedText,
           shouldShow: true,
         },
         {
           value: '+s',
-          text: this.$options.i18n.referenceSummary[this.referenceType],
+          text: this.$options.i18n.referenceSummary,
           matcher: (text) => text.endsWith('+s'),
           getText: () => this.fullyExpandedText,
-          shouldShow: this.isIssue || this.isMergeRequest,
+          shouldShow: this.showSummary,
         },
       ];
     },
@@ -138,31 +145,11 @@ export default {
     placement: 'bottom',
   },
   i18n: {
-    referenceId: {
-      issue: __('Issue ID'),
-      merge_request: __('Merge request ID'),
-      epic: __('Epic ID'),
-    },
-    referenceTitle: {
-      issue: __('Issue title'),
-      merge_request: __('Merge request title'),
-      epic: __('Epic title'),
-    },
-    referenceSummary: {
-      issue: __('Issue summary'),
-      merge_request: __('Merge request summary'),
-      epic: __('Epic summary'),
-    },
-    copyURLLabel: {
-      issue: __('Copy issue URL'),
-      merge_request: __('Copy merge request URL'),
-      epic: __('Copy epic URL'),
-    },
-    removeLabel: {
-      issue: __('Remove issue reference'),
-      merge_request: __('Remove merge request reference'),
-      epic: __('Remove epic reference'),
-    },
+    referenceId: __('ID'),
+    referenceTitle: __('Title'),
+    referenceSummary: __('Summary'),
+    copyURLLabel: __('Copy URL'),
+    removeLabel: __('Remove reference'),
   },
 };
 </script>
@@ -196,8 +183,8 @@ export default {
           category="tertiary"
           size="medium"
           data-testid="copy-reference-url"
-          :aria-label="$options.i18n.copyURLLabel[referenceType]"
-          :title="$options.i18n.copyURLLabel[referenceType]"
+          :aria-label="$options.i18n.copyURLLabel"
+          :title="$options.i18n.copyURLLabel"
           icon="copy-to-clipboard"
           @click="copyReferenceURL"
         />
@@ -207,8 +194,8 @@ export default {
           category="tertiary"
           size="medium"
           data-testid="remove-reference"
-          :aria-label="$options.i18n.removeLabel[referenceType]"
-          :title="$options.i18n.removeLabel[referenceType]"
+          :aria-label="$options.i18n.removeLabel"
+          :title="$options.i18n.removeLabel"
           icon="remove"
           @click="removeReference"
         />

app/assets/javascripts/content_editor/constants/reference_types.js

@@ -0,0 +1,14 @@
+export const REFERENCE_TYPES = {
+  ISSUE: 'issue',
+  MERGE_REQUEST: 'merge_request',
+  EPIC: 'epic',
+  WORK_ITEM: 'work_item',
+  COMMAND: 'command',
+  USER: 'user',
+  LABEL: 'label',
+  SNIPPET: 'snippet',
+  VULNERABILITY: 'vulnerability',
+  MILESTONE: 'milestone',
+  WIKI: 'wiki',
+  EMOJI: 'emoji',
+};