.eslintignore

@@ -9,4 +9,3 @@
 /sitespeed-result/
 /fixtures/**/*.graphql
 spec/fixtures/**/*.graphql
-**/contracts/consumer/

.gitlab/CODEOWNERS

@@ -604,6 +604,7 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/gitlab-basics/ @aqualls
 /doc/install/ @axil
 /doc/integration/ @kpaizee
+/doc/integration/advanced_search/ @sselhorn
 /doc/integration/elasticsearch.md @sselhorn
 /doc/integration/gitpod.md @aqualls
 /doc/integration/kerberos.md @eread

.gitlab/ci/rules.gitlab-ci.yml

@@ -1076,10 +1076,8 @@
   rules:
     - <<: *if-merge-request-labels-run-all-rspec
     - <<: *if-merge-request
-      changes: *core-backend-patterns
-    - <<: *if-merge-request
-      changes: *ci-patterns
-    - changes: ["config/**/*"]
+      changes: *backend-patterns
+    - changes: *core-backend-patterns
 
 .rails:rules:code-backstage-qa:
   rules:

.gitlab/issue_templates/Feature Flag Roll Out.md

@@ -62,8 +62,7 @@ _Consider adding links to check for Sentry errors, Production logs for 5xx, 302s
 - Ensure that the feature MRs have been deployed to non-production environments.
     - [ ] `/chatops run auto_deploy status <merge-commit-of-your-feature>`
 - [ ] Enable the feature globally on non-production environments.
-    - [ ] `/chatops run feature set <feature-flag-name> true --dev`
-    - [ ] `/chatops run feature set <feature-flag-name> true --staging`
+    - [ ] `/chatops run feature set <feature-flag-name> true --dev --staging`
 - [ ] Verify that the feature works as expected. Posting the QA result in this issue is preferable.
       The best environment to validate the feature in is [staging-canary](https://about.gitlab.com/handbook/engineering/infrastructure/environments/#staging-canary)
       as this is the first environment deployed to. Note you will need to make sure you are configured to use canary as outlined [here](https://about.gitlab.com/handbook/engineering/infrastructure/environments/canary-stage/)
@@ -121,9 +120,7 @@ To do so, follow these steps:
       the feature can be officially announced in a release blog post.
     - [ ] `/chatops run release check <merge-request-url> <milestone>`
 - [ ] Consider cleaning up the feature flag from all environments by running these chatops command in `#production` channel. Otherwise these settings may override the default enabled.
-    - [ ] `/chatops run feature delete <feature-flag-name> --dev`
-    - [ ] `/chatops run feature delete <feature-flag-name> --staging`
-    - [ ] `/chatops run feature delete <feature-flag-name>`
+    - [ ] `/chatops run feature delete <feature-flag-name> --dev --staging --production`
 - [ ] Close [the feature issue](ISSUE LINK) to indicate the feature will be released in the current milestone.
 - [ ] Set the next milestone to this rollout issue for scheduling [the flag removal](#release-the-feature).
 - [ ] (Optional) You can [create a separate issue](https://gitlab.com/gitlab-org/gitlab/-/issues/new?issuable_template=Feature%20Flag%20Cleanup) for scheduling the steps below to [Release the feature](#release-the-feature).
@@ -159,9 +156,7 @@ You can either [create a follow-up issue for Feature Flag Cleanup](https://gitla
     - [ ] `/chatops run release check <merge-request-url> <milestone>`
 - [ ] Close [the feature issue](ISSUE LINK) to indicate the feature will be released in the current milestone.
 - [ ] If not already done, clean up the feature flag from all environments by running these chatops command in `#production` channel:
-    - [ ] `/chatops run feature delete <feature-flag-name> --dev`
-    - [ ] `/chatops run feature delete <feature-flag-name> --staging`
-    - [ ] `/chatops run feature delete <feature-flag-name>`
+    - [ ] `/chatops run feature delete <feature-flag-name> --dev --staging --production`
 - [ ] Close this rollout issue.
 
 ## Rollback Steps

.haml-lint.yml

@@ -84,9 +84,9 @@ linters:
 
   RuboCop:
     enabled: true
-    # These cops are incredibly noisy when it comes to HAML templates, so we
-    # ignore them.
     ignored_cops:
+      # These cops are incredibly noisy when it comes to HAML templates, so we
+      # ignore them.
       - Layout/BlockAlignment
       - Layout/EndAlignment
       - Layout/LineLength
@@ -103,6 +103,7 @@ linters:
       - Style/Next
       - Style/TrailingWhitespace
       - Style/WhileUntilModifier
+      - Cop/StaticTranslationDefinition
 
       # These cops should eventually get enabled
       - Cop/LineBreakAfterGuardClauses

.rubocop_todo/cop/static_translation_definition.yml

+---
+Cop/StaticTranslationDefinition:
+  Exclude:
+    - 'app/models/application_setting.rb'
+    - 'app/models/diff_viewer/image.rb'
+    - 'app/models/diff_viewer/rich.rb'
+    - 'app/models/diff_viewer/simple.rb'
+    - 'app/models/group_group_link.rb'
+    - 'app/models/integrations/bamboo.rb'
+    - 'app/models/integrations/buildkite.rb'
+    - 'app/models/integrations/drone_ci.rb'
+    - 'app/models/integrations/jenkins.rb'
+    - 'app/models/integrations/jira.rb'
+    - 'app/models/integrations/mock_ci.rb'
+    - 'app/models/integrations/teamcity.rb'
+    - 'app/models/jira_import_state.rb'
+    - 'app/models/member.rb'
+    - 'app/models/project.rb'
+    - 'app/models/project_group_link.rb'
+    - 'app/models/user.rb'
+    - 'app/models/users/banned_user.rb'
+    - 'ee/app/models/allowed_email_domain.rb'
+    - 'ee/app/models/dast/site_profile_secret_variable.rb'
+    - 'ee/app/models/group_merge_request_approval_setting.rb'
+    - 'ee/app/models/incident_management/escalation_policy.rb'
+    - 'ee/app/models/incident_management/escalation_rule.rb'
+    - 'ee/app/models/vulnerabilities/read.rb'
+    - 'ee/lib/ee/gitlab/quick_actions/epic_actions.rb'
+    - 'ee/lib/ee/gitlab/quick_actions/issue_actions.rb'
+    - 'ee/lib/ee/gitlab/quick_actions/issue_and_merge_request_actions.rb'
+    - 'ee/lib/ee/gitlab/quick_actions/merge_request_actions.rb'
+    - 'lib/gitlab/quick_actions/commit_actions.rb'
+    - 'lib/gitlab/quick_actions/issuable_actions.rb'
+    - 'lib/gitlab/quick_actions/issue_actions.rb'
+    - 'lib/gitlab/quick_actions/issue_and_merge_request_actions.rb'
+    - 'lib/gitlab/quick_actions/merge_request_actions.rb'
+    - 'lib/gitlab/quick_actions/relate_actions.rb'

.rubocop_todo/gitlab/namespaced_class.yml

@@ -1101,7 +1101,6 @@ Gitlab/NamespacedClass:
     - 'ee/lib/gitlab/items_collection.rb'
     - 'ee/lib/gitlab/manual_banner.rb'
     - 'ee/lib/gitlab/manual_quarterly_co_term_banner.rb'
-    - 'ee/lib/gitlab/manual_renewal_banner.rb'
     - 'ee/lib/gitlab/pagination_delegate.rb'
     - 'ee/lib/gitlab/path_locks_finder.rb'
     - 'ee/lib/gitlab/proxy.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -1052,7 +1052,6 @@ RSpec/ContextWording:
     - 'ee/spec/services/vulnerability_exports/export_service_spec.rb'
     - 'ee/spec/services/vulnerability_external_issue_links/create_service_spec.rb'
     - 'ee/spec/support/features/manual_quarterly_co_term_banner_examples.rb'
-    - 'ee/spec/support/features/manual_renewal_banner_examples.rb'
     - 'ee/spec/support/protected_tags/access_control_shared_examples.rb'
     - 'ee/spec/support/shared_contexts/audit_event_not_licensed_shared_context.rb'
     - 'ee/spec/support/shared_contexts/audit_event_queue_shared_context.rb'

.rubocop_todo/style/format_string.yml

@@ -263,7 +263,6 @@ Style/FormatString:
     - 'ee/lib/gitlab/expiring_subscription_message.rb'
     - 'ee/lib/gitlab/geo.rb'
     - 'ee/lib/gitlab/manual_quarterly_co_term_banner.rb'
-    - 'ee/lib/gitlab/manual_renewal_banner.rb'
     - 'ee/lib/gitlab/vulnerabilities/container_scanning_vulnerability.rb'
     - 'ee/lib/tasks/gitlab/elastic.rake'
     - 'ee/spec/controllers/admin/licenses_controller_spec.rb'

GITALY_SERVER_VERSION

-1fb1d2f7119c5d7bfdbc53e8ae9cc22058921219
+cbf1828697a6765416ca93bc373970db440cee08

GITLAB_PAGES_VERSION

-1.58.0
+1.59.0

Gemfile

@@ -17,7 +17,7 @@ gem 'view_component', '~> 2.50.0'
 gem 'default_value_for', '~> 3.4.0'
 
 # Supported DBs
-gem 'pg', '~> 1.1'
+gem 'pg', '~> 1.3.0'
 
 gem 'rugged', '~> 1.2'
 gem 'grape-path-helpers', '~> 1.7.0'
@@ -167,10 +167,10 @@ gem 'asciidoctor', '~> 2.0.10'
 gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
 gem 'asciidoctor-plantuml', '~> 0.0.12'
 gem 'asciidoctor-kroki', '~> 0.5.0', require: false
-gem 'rouge', '~> 3.27.0'
+gem 'rouge', '~> 3.29.0'
 gem 'truncato', '~> 0.7.11'
 gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.12'
+gem 'nokogiri', '~> 1.13.6'
 gem 'escape_utils', '~> 1.1'
 
 # Calendar rendering
@@ -311,7 +311,7 @@ gem 'sentry-sidekiq', '~> 5.1.1'
 
 # PostgreSQL query parsing
 #
-gem 'pg_query', '~> 2.1'
+gem 'pg_query', '~> 2.1.0'
 
 gem 'premailer-rails', '~> 1.10.3'
 
@@ -479,7 +479,7 @@ gem 'sys-filesystem', '~> 1.4.3'
 gem 'net-ntp'
 
 # SSH keys support
-gem 'ssh_data', '~> 1.2'
+gem 'ssh_data', '~> 1.3'
 
 # Spamcheck GRPC protocol definitions
 gem 'spamcheck', '~> 0.1.0'
@@ -547,3 +547,5 @@ gem 'ipaddress', '~> 0.8.3'
 gem 'parslet', '~> 1.8'
 
 gem 'ipynbdiff', '0.4.7'
+
+gem 'ed25519', '~> 1.3.0'

Gemfile.lock

@@ -313,6 +313,7 @@ GEM
     e2mmap (0.1.0)
     ecma-re-validator (0.3.0)
       regexp_parser (~> 2.0)
+    ed25519 (1.3.0)
     elasticsearch (7.13.3)
       elasticsearch-api (= 7.13.3)
       elasticsearch-transport (= 7.13.3)
@@ -806,7 +807,7 @@ GEM
     netrc (0.11.0)
     nio4r (2.5.8)
     no_proxy_fix (0.1.2)
-    nokogiri (1.13.3)
+    nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -947,9 +948,9 @@ GEM
       tty-color (~> 0.5)
     peek (1.1.0)
       railties (>= 4.0.0)
-    pg (1.2.3)
-    pg_query (2.1.1)
-      google-protobuf (>= 3.17.1)
+    pg (1.3.5)
+    pg_query (2.1.3)
+      google-protobuf (>= 3.19.2)
     plist (3.6.0)
     png_quantizator (0.2.1)
     po_to_json (1.0.1)
@@ -1089,7 +1090,7 @@ GEM
     rexml (3.2.5)
     rinku (2.0.0)
     rotp (6.2.0)
-    rouge (3.27.0)
+    rouge (3.29.0)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
@@ -1285,7 +1286,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    ssh_data (1.2.0)
+    ssh_data (1.3.0)
     ssrf_filter (1.0.7)
     stackprof (0.2.15)
     state_machines (0.5.0)
@@ -1501,6 +1502,7 @@ DEPENDENCIES
   discordrb-webhooks (~> 3.4)
   doorkeeper (~> 5.5.0.rc2)
   doorkeeper-openid_connect (~> 1.7.5)
+  ed25519 (~> 1.3.0)
   elasticsearch-api (= 7.13.3)
   elasticsearch-model (~> 7.2)
   elasticsearch-rails (~> 7.2)
@@ -1601,7 +1603,7 @@ DEPENDENCIES
   multi_json (~> 1.14.1)
   net-ldap (~> 0.16.3)
   net-ntp
-  nokogiri (~> 1.12)
+  nokogiri (~> 1.13.6)
   oauth2 (~> 1.4)
   octokit (~> 4.15)
   ohai (~> 16.10)
@@ -1630,8 +1632,8 @@ DEPENDENCIES
   parallel (~> 1.19)
   parslet (~> 1.8)
   peek (~> 1.1)
-  pg (~> 1.1)
-  pg_query (~> 2.1)
+  pg (~> 1.3.0)
+  pg_query (~> 2.1.0)
   png_quantizator (~> 0.2.1)
   premailer-rails (~> 1.10.3)
   prometheus-client-mmap (~> 0.15.0)
@@ -1661,7 +1663,7 @@ DEPENDENCIES
   responders (~> 3.0)
   retriable (~> 3.1.2)
   rexml (~> 3.2.5)
-  rouge (~> 3.27.0)
+  rouge (~> 3.29.0)
   rqrcode-rails3 (~> 0.1.7)
   rspec-benchmark (~> 0.6.0)
   rspec-parameterized
@@ -1704,7 +1706,7 @@ DEPENDENCIES
   spring-commands-rspec (~> 1.0.4)
   sprite-factory (~> 1.7)
   sprockets (~> 3.7.0)
-  ssh_data (~> 1.2)
+  ssh_data (~> 1.3)
   stackprof (~> 0.2.15)
   state_machines-activerecord (~> 0.8.0)
   sys-filesystem (~> 1.4.3)

app/assets/javascripts/access_tokens/components/access_token_table_app.vue

@@ -10,6 +10,7 @@ import { EVENT_SUCCESS, FIELDS, FORM_SELECTOR, INITIAL_PAGE, PAGE_SIZE } from '.
 
 export default {
   EVENT_SUCCESS,
+  FORM_SELECTOR,
   PAGE_SIZE,
   name: 'AccessTokenTableApp',
   components: {
@@ -55,9 +56,6 @@ export default {
     filteredFields() {
       return this.showRole ? FIELDS : FIELDS.filter((field) => field.key !== 'role');
     },
-    formSelector() {
-      return `#${FORM_SELECTOR}`;
-    },
     header() {
       return sprintf(this.$options.i18n.header, {
         accessTokenTypePlural: this.accessTokenTypePlural,
@@ -97,7 +95,7 @@ export default {
 </script>
 
 <template>
-  <dom-element-listener :selector="formSelector" @[$options.EVENT_SUCCESS]="onSuccess">
+  <dom-element-listener :selector="$options.FORM_SELECTOR" @[$options.EVENT_SUCCESS]="onSuccess">
     <div>
       <hr />
       <h5>{{ header }}</h5>

app/assets/javascripts/access_tokens/components/constants.js

@@ -2,7 +2,7 @@ import { __, s__ } from '~/locale';
 
 export const EVENT_ERROR = 'ajax:error';
 export const EVENT_SUCCESS = 'ajax:success';
-export const FORM_SELECTOR = 'js-new-access-token-form';
+export const FORM_SELECTOR = '#js-new-access-token-form';
 
 export const INITIAL_PAGE = 1;
 export const PAGE_SIZE = 100;

app/assets/javascripts/access_tokens/components/new_access_token_app.vue

@@ -9,6 +9,7 @@ import { EVENT_ERROR, EVENT_SUCCESS, FORM_SELECTOR } from './constants';
 export default {
   EVENT_ERROR,
   EVENT_SUCCESS,
+  FORM_SELECTOR,
   name: 'NewAccessTokenApp',
   components: { DomElementListener, GlAlert, InputCopyToggleVisibility },
   i18n: {
@@ -46,16 +47,13 @@ export default {
         name: this.$options.tokenInputId,
       };
     },
-    formSelector() {
-      return `#${FORM_SELECTOR}`;
-    },
     label() {
       return sprintf(this.$options.i18n.label, { accessTokenType: this.accessTokenType });
     },
   },
   mounted() {
     /** @type {HTMLFormElement} */
-    this.form = document.getElementById(FORM_SELECTOR);
+    this.form = document.querySelector(FORM_SELECTOR);
 
     /** @type {HTMLInputElement} */
     this.submitButton = this.form.querySelector('input[type=submit]');
@@ -92,7 +90,7 @@ export default {
 
 <template>
   <dom-element-listener
-    :selector="formSelector"
+    :selector="$options.FORM_SELECTOR"
     @[$options.EVENT_ERROR]="onError"
     @[$options.EVENT_SUCCESS]="onSuccess"
   >

app/assets/javascripts/admin/users/components/users_table.vue

@@ -2,7 +2,7 @@
 import { GlSkeletonLoader, GlTable } from '@gitlab/ui';
 import createFlash from '~/flash';
 import { convertNodeIdsFromGraphQLIds } from '~/graphql_shared/utils';
-import { thWidthClass } from '~/lib/utils/table_utility';
+import { thWidthPercent } from '~/lib/utils/table_utility';
 import { s__, __ } from '~/locale';
 import UserDate from '~/vue_shared/components/user_date.vue';
 import getUsersGroupCountsQuery from '../graphql/queries/get_users_group_counts.query.graphql';
@@ -70,32 +70,32 @@ export default {
     {
       key: 'name',
       label: __('Name'),
-      thClass: thWidthClass(40),
+      thClass: thWidthPercent(40),
     },
     {
       key: 'projectsCount',
       label: __('Projects'),
-      thClass: thWidthClass(10),
+      thClass: thWidthPercent(10),
     },
     {
       key: 'groupCount',
       label: __('Groups'),
-      thClass: thWidthClass(10),
+      thClass: thWidthPercent(10),
     },
     {
       key: 'createdAt',
       label: __('Created on'),
-      thClass: thWidthClass(15),
+      thClass: thWidthPercent(15),
     },
     {
       key: 'lastActivityOn',
       label: __('Last activity'),
-      thClass: thWidthClass(15),
+      thClass: thWidthPercent(15),
     },
     {
       key: 'settings',
       label: '',
-      thClass: thWidthClass(10),
+      thClass: thWidthPercent(10),
     },
   ],
 };

app/assets/javascripts/boards/components/board_app.vue

 <script>
-import { mapActions, mapGetters } from 'vuex';
+import { mapGetters } from 'vuex';
+import { refreshCurrentPage } from '~/lib/utils/url_utility';
 import BoardContent from '~/boards/components/board_content.vue';
 import BoardSettingsSidebar from '~/boards/components/board_settings_sidebar.vue';
 import BoardTopBar from '~/boards/components/board_top_bar.vue';
@@ -14,11 +15,11 @@ export default {
   computed: {
     ...mapGetters(['isSidebarOpen']),
   },
-  mounted() {
-    this.performSearch();
+  created() {
+    window.addEventListener('popstate', refreshCurrentPage);
   },
-  methods: {
-    ...mapActions(['performSearch']),
+  destroyed() {
+    window.removeEventListener('popstate', refreshCurrentPage);
   },
 };
 </script>

app/assets/javascripts/boards/components/boards_selector.vue

@@ -14,6 +14,8 @@ import { mapActions, mapGetters, mapState } from 'vuex';
 import BoardForm from 'ee_else_ce/boards/components/board_form.vue';
 
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
+import { isMetaKey } from '~/lib/utils/common_utils';
+import { updateHistory } from '~/lib/utils/url_utility';
 import { s__ } from '~/locale';
 
 import eventHub from '../eventhub';
@@ -21,6 +23,7 @@ import groupBoardsQuery from '../graphql/group_boards.query.graphql';
 import projectBoardsQuery from '../graphql/project_boards.query.graphql';
 import groupRecentBoardsQuery from '../graphql/group_recent_boards.query.graphql';
 import projectRecentBoardsQuery from '../graphql/project_recent_boards.query.graphql';
+import { fullBoardId } from '../boards_util';
 
 const MIN_BOARDS_TO_VIEW_RECENT = 10;
 
@@ -112,6 +115,9 @@ export default {
       this.scrollFadeInitialized = false;
       this.$nextTick(this.setScrollFade);
     },
+    board(newBoard) {
+      document.title = newBoard.name;
+    },
   },
   created() {
     eventHub.$on('showBoardModal', this.showPage);
@@ -120,7 +126,7 @@ export default {
     eventHub.$off('showBoardModal', this.showPage);
   },
   methods: {
-    ...mapActions(['setError', 'setBoardConfig']),
+    ...mapActions(['setError', 'fetchBoard', 'unsetActiveId']),
     showPage(page) {
       this.currentPage = page;
     },
@@ -196,6 +202,22 @@ export default {
 
       this.hasScrollFade = this.isScrolledUp();
     },
+    fetchCurrentBoard(boardId) {
+      this.fetchBoard({
+        fullPath: this.fullPath,
+        fullBoardId: fullBoardId(boardId),
+        boardType: this.boardType,
+      });
+    },
+    async switchBoard(boardId, e) {
+      if (isMetaKey(e)) {
+        window.open(`${this.boardBaseUrl}/${boardId}`, '_blank');
+      } else {
+        this.unsetActiveId();
+        this.fetchCurrentBoard(boardId);
+        updateHistory({ url: `${this.boardBaseUrl}/${boardId}` });
+      }
+    },
   },
   i18n: {
     errorFetchingBoard: s__('Board|An error occurred while fetching the board, please try again.'),
@@ -242,8 +264,8 @@ export default {
             <gl-dropdown-item
               v-for="recentBoard in recentBoards"
               :key="`recent-${recentBoard.id}`"
-              :href="`${boardBaseUrl}/${recentBoard.id}`"
               data-testid="dropdown-item"
+              @click.prevent="switchBoard(recentBoard.id, $event)"
             >
               {{ recentBoard.name }}
             </gl-dropdown-item>
@@ -258,8 +280,8 @@ export default {
           <gl-dropdown-item
             v-for="otherBoard in filteredBoards"
             :key="otherBoard.id"
-            :href="`${boardBaseUrl}/${otherBoard.id}`"
             data-testid="dropdown-item"
+            @click.prevent="switchBoard(otherBoard.id, $event)"
           >
             {{ otherBoard.name }}
           </gl-dropdown-item>

app/assets/javascripts/boards/stores/actions.js

@@ -68,8 +68,7 @@ export default {
           commit(types.RECEIVE_BOARD_FAILURE);
         } else {
           const board = data.workspace?.board;
-          commit(types.RECEIVE_BOARD_SUCCESS, board);
-          dispatch('setBoardConfig', board);
+          dispatch('setBoard', board);
         }
       })
       .catch(() => commit(types.RECEIVE_BOARD_FAILURE));
@@ -420,9 +419,6 @@ export default {
   fetchItemsForList: ({ state, commit }, { listId, fetchNext = false }) => {
     if (!listId) return null;
 
-    if (!fetchNext) {
-      commit(types.RESET_ITEMS_FOR_LIST, listId);
-    }
     commit(types.REQUEST_ITEMS_FOR_LIST, { listId, fetchNext });
 
     const { fullPath, fullBoardId, boardType, filterParams } = state;
@@ -444,6 +440,7 @@ export default {
           isSingleRequest: true,
         },
         variables,
+        ...(!fetchNext ? { fetchPolicy: fetchPolicies.NO_CACHE } : {}),
       })
       .then(({ data }) => {
         const { lists } = data[boardType].board;