.gitlab/issue_templates/Geo Replicate a new Git repository type.md

@@ -60,7 +60,7 @@ Geo secondary sites have a [Geo tracking database](https://gitlab.com/gitlab-org
     disable_ddl_transaction!
 
     def up
-      ApplicationRecord.transaction do
+      Geo::TrackingBase.transaction do
         create_table :cool_widget_registry, id: :bigserial, force: :cascade do |t|
           t.bigint :cool_widget_id, null: false
           t.datetime_with_timezone :created_at, null: false
@@ -269,7 +269,6 @@ That's all of the required database changes.
     def pool_repository
       nil
     end
-    ...
 
     def cool_widget_state
       super || build_cool_widget_state
@@ -389,14 +388,16 @@ That's all of the required database changes.
   ```ruby
   # frozen_string_literal: true
 
-  class Geo::CoolWidgetRegistry < Geo::BaseRegistry
-    include ::Geo::ReplicableRegistry
-    include ::Geo::VerifiableRegistry
+  module Geo
+    class CoolWidgetRegistry < Geo::BaseRegistry
+      include ::Geo::ReplicableRegistry
+      include ::Geo::VerifiableRegistry
 
-    MODEL_CLASS = ::CoolWidget
-    MODEL_FOREIGN_KEY = :cool_widget_id
+      MODEL_CLASS = ::CoolWidget
+      MODEL_FOREIGN_KEY = :cool_widget_id
 
-    belongs_to :cool_widget, class_name: 'CoolWidget'
+      belongs_to :cool_widget, class_name: 'CoolWidget'
+    end
   end
   ```
 
@@ -463,13 +464,13 @@ That's all of the required database changes.
 - [ ] Add the following to `spec/factories/cool_widgets.rb`:
 
   ```ruby
-  trait(:verification_succeeded) do
+  trait :verification_succeeded do
     with_file
     verification_checksum { 'abc' }
     verification_state { CoolWidget.verification_state_value(:verification_succeeded) }
   end
 
-  trait(:verification_failed) do
+  trait :verification_failed do
     with_file
     verification_failure { 'Could not calculate the checksum' }
     verification_state { CoolWidget.verification_state_value(:verification_failed) }
@@ -507,11 +508,11 @@ That's all of the required database changes.
     factory :geo_cool_widget_state, class: 'Geo::CoolWidgetState' do
       cool_widget
 
-      trait(:checksummed) do
+      trait :checksummed do
         verification_checksum { 'abc' }
       end
 
-      trait(:checksum_failure) do
+      trait :checksum_failure do
         verification_failure { 'Could not calculate the checksum' }
       end
     end
@@ -561,8 +562,9 @@ The GraphQL API is used by `Admin > Geo > Replication Details` views, and is dir
   field :cool_widget_registries, ::Types::Geo::CoolWidgetRegistryType.connection_type,
         null: true,
         resolver: ::Resolvers::Geo::CoolWidgetRegistriesResolver,
-        description: 'Find Cool Widget registries on this Geo node',
-        feature_flag: :geo_cool_widget_replication
+        description: 'Find Cool Widget registries on this Geo node. '\
+                     'Ignored if `geo_cool_widget_replication` feature flag is disabled.',
+        alpha: { milestone: '15.5' } # Update the milestone
   ```
 
 - [ ] Add the new `cool_widget_registries` field name to the `expected_fields` array in `ee/spec/graphql/types/geo/geo_node_type_spec.rb`.
@@ -627,13 +629,15 @@ The GraphQL API is used by `Admin > Geo > Replication Details` views, and is dir
     module Geo
       # rubocop:disable Graphql/AuthorizeTypes because it is included
       class CoolWidgetRegistryType < BaseObject
+        graphql_name 'CoolWidgetRegistry'
+
         include ::Types::Geo::RegistryType
 
-        graphql_name 'CoolWidgetRegistry'
         description 'Represents the Geo replication and verification state of a cool_widget'
 
         field :cool_widget_id, GraphQL::Types::ID, null: false, description: 'ID of the Cool Widget.'
       end
+      # rubocop:enable Graphql/AuthorizeTypes
     end
   end
   ```
@@ -717,14 +721,15 @@ As illustrated by the above two examples, batch destroy logic cannot be handled
   - [ ] Add a step to `Test replication and verification of Cool Widgets on a non-GDK-deployment. For example, using GitLab Environment Toolkit`.
   - [ ] Add a step to `Ping the Geo PM and EM to coordinate testing`. For example, you might add steps to generate Cool Widgets, and then a Geo engineer may take it from there.
 - [ ] In `ee/config/feature_flags/development/geo_cool_widget_replication.yml`, set `default_enabled: true`
-- [ ] In `ee/app/graphql/types/geo/geo_node_type.rb`, remove the `feature_flag` option for the released type:
+- [ ] In `ee/app/graphql/types/geo/geo_node_type.rb`, remove the `alpha` option for the released type:
 
   ```ruby
   field :cool_widget_registries, ::Types::Geo::CoolWidgetRegistryType.connection_type,
         null: true,
         resolver: ::Resolvers::Geo::CoolWidgetRegistriesResolver,
-        description: 'Find Cool Widget registries on this Geo node',
-        feature_flag: :geo_cool_widget_replication # REMOVE THIS LINE
+        description: 'Find Cool Widget registries on this Geo node. '\
+                     'Ignored if `geo_cool_widget_replication` feature flag is disabled.',
+        alpha: { milestone: '15.5' } # Update the milestone
   ```
 
 - [ ] Run `bundle exec rake gitlab:graphql:compile_docs` after the step above to regenerate the GraphQL docs.

.gitlab/issue_templates/Geo Replicate a new blob type.md

@@ -58,11 +58,11 @@ Geo secondary sites have a [Geo tracking database](https://gitlab.com/gitlab-org
   ```ruby
   # frozen_string_literal: true
 
-  class CreateCoolWidgetRegistry < Gitlab::Database::Migration[1.0]
+  class CreateCoolWidgetRegistry < Gitlab::Database::Migration[2.0]
     disable_ddl_transaction!
 
     def up
-      ApplicationRecord.transaction do
+      Geo::TrackingBase.transaction do
         create_table :cool_widget_registry, id: :bigserial, force: :cascade do |t|
           t.bigint :cool_widget_id, null: false
           t.datetime_with_timezone :created_at, null: false
@@ -247,7 +247,8 @@ That's all of the required database changes.
         # we want to know which records to replicate. This is not easy to automate
         # because for example:
         #
-        # * The "selective sync" feature allows admins to choose which namespaces #   to replicate, per secondary site. Most Models are scoped to a
+        # * The "selective sync" feature allows admins to choose which namespaces
+        #   to replicate, per secondary site. Most Models are scoped to a
         #   namespace, but the nature of the relationship to a namespace varies
         #   between Models.
         # * The "selective sync" feature allows admins to choose which shards to
@@ -265,7 +266,6 @@ That's all of the required database changes.
         CoolWidgetState
       end
     end
-    ...
 
     def cool_widget_state
       super || build_cool_widget_state
@@ -317,7 +317,7 @@ That's all of the required database changes.
   end
   ```
 
-- [ ] Generate the feature flag definition fileы by running the feature flag commands and following the command prompts:
+- [ ] Generate the feature flag definition file by running the feature flag commands and following the command prompts:
 
   ```shell
   bin/feature-flag --ee geo_cool_widget_replication --type development --group 'group::geo'
@@ -355,14 +355,16 @@ That's all of the required database changes.
   ```ruby
   # frozen_string_literal: true
 
-  class Geo::CoolWidgetRegistry < Geo::BaseRegistry
-    include ::Geo::ReplicableRegistry
-    include ::Geo::VerifiableRegistry
+  module Geo
+    class CoolWidgetRegistry < Geo::BaseRegistry
+      include ::Geo::ReplicableRegistry
+      include ::Geo::VerifiableRegistry
 
-    MODEL_CLASS = ::CoolWidget
-    MODEL_FOREIGN_KEY = :cool_widget_id
+      MODEL_CLASS = ::CoolWidget
+      MODEL_FOREIGN_KEY = :cool_widget_id
 
-    belongs_to :cool_widget, class_name: 'CoolWidget'
+      belongs_to :cool_widget, class_name: 'CoolWidget'
+    end
   end
   ```
 
@@ -429,13 +431,13 @@ That's all of the required database changes.
 - [ ] Add the following to `spec/factories/cool_widgets.rb`:
 
   ```ruby
-  trait(:verification_succeeded) do
+  trait :verification_succeeded do
     with_file
     verification_checksum { 'abc' }
     verification_state { CoolWidget.verification_state_value(:verification_succeeded) }
   end
 
-  trait(:verification_failed) do
+  trait :verification_failed do
     with_file
     verification_failure { 'Could not calculate the checksum' }
     verification_state { CoolWidget.verification_state_value(:verification_failed) }
@@ -447,6 +449,8 @@ That's all of the required database changes.
 - [ ] Following [the example of Merge Request Diffs](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63309) add a `Geo::CoolWidgetState` model in `ee/app/models/ee/geo/cool_widget_state.rb`:
 
   ``` ruby
+  # frozen_string_literal: true
+
   module Geo
     class CoolWidgetState < ApplicationRecord
       include EachBatch
@@ -471,11 +475,11 @@ That's all of the required database changes.
     factory :geo_cool_widget_state, class: 'Geo::CoolWidgetState' do
       cool_widget
 
-      trait(:checksummed) do
+      trait :checksummed do
         verification_checksum { 'abc' }
       end
 
-      trait(:checksum_failure) do
+      trait :checksum_failure do
         verification_failure { 'Could not calculate the checksum' }
       end
     end
@@ -525,8 +529,9 @@ The GraphQL API is used by `Admin > Geo > Replication Details` views, and is dir
   field :cool_widget_registries, ::Types::Geo::CoolWidgetRegistryType.connection_type,
         null: true,
         resolver: ::Resolvers::Geo::CoolWidgetRegistriesResolver,
-        description: 'Find Cool Widget registries on this Geo node',
-        feature_flag: :geo_cool_widget_replication
+        description: 'Find Cool Widget registries on this Geo node. '\
+                     'Ignored if `geo_cool_widget_replication` feature flag is disabled.',
+        alpha: { milestone: '15.5' } # Update the milestone
   ```
 
 - [ ] Add the new `cool_widget_registries` field name to the `expected_fields` array in `ee/spec/graphql/types/geo/geo_node_type_spec.rb`.
@@ -591,13 +596,15 @@ The GraphQL API is used by `Admin > Geo > Replication Details` views, and is dir
     module Geo
       # rubocop:disable Graphql/AuthorizeTypes because it is included
       class CoolWidgetRegistryType < BaseObject
+        graphql_name 'CoolWidgetRegistry'
+
         include ::Types::Geo::RegistryType
 
-        graphql_name 'CoolWidgetRegistry'
         description 'Represents the Geo replication and verification state of a cool_widget'
 
-        field :cool_widget_id, GraphQL::ID_TYPE, null: false, description: 'ID of the Cool Widget'
+        field :cool_widget_id, GraphQL::Types::ID, null: false, description: 'ID of the Cool Widget.'
       end
+      # rubocop:enable Graphql/AuthorizeTypes
     end
   end
   ```
@@ -682,14 +689,15 @@ As illustrated by the above two examples, batch destroy logic cannot be handled
   - [ ] Add a step to `Test replication and verification of Cool Widgets on a non-GDK-deployment. For example, using GitLab Environment Toolkit`.
   - [ ] Add a step to `Ping the Geo PM and EM to coordinate testing`. For example, you might add steps to generate Cool Widgets, and then a Geo engineer may take it from there.
 - [ ] In `ee/config/feature_flags/development/geo_cool_widget_replication.yml`, set `default_enabled: true`
-- [ ] In `ee/app/graphql/types/geo/geo_node_type.rb`, remove the `feature_flag` option for the released type:
+- [ ] In `ee/app/graphql/types/geo/geo_node_type.rb`, remove the `alpha` option for the released type:
 
   ```ruby
   field :cool_widget_registries, ::Types::Geo::CoolWidgetRegistryType.connection_type,
         null: true,
         resolver: ::Resolvers::Geo::CoolWidgetRegistriesResolver,
-        description: 'Find Cool Widget registries on this Geo node',
-        feature_flag: :geo_cool_widget_replication # REMOVE THIS LINE
+        description: 'Find Cool Widget registries on this Geo node. '\
+                     'Ignored if `geo_cool_widget_replication` feature flag is disabled.',
+        alpha: { milestone: '15.5' } # Update the milestone
   ```
 
 - [ ] Run `bundle exec rake gitlab:graphql:compile_docs` after the step above to regenerate the GraphQL docs.

.rubocop.yml

@@ -53,6 +53,15 @@ AllCops:
   NewCops: disable
   SuggestExtensions: false
 
+RSpec:
+  Language:
+    Includes:
+      Examples:
+        - run_permission_checks
+        - run_group_permission_checks
+        - it_should_email!
+        - it_should_not_email!
+
 Metrics/ParameterLists:
   Exclude:
     # See https://gitlab.com/gitlab-org/gitlab/-/issues/356771
@@ -107,8 +116,7 @@ Style/FrozenStringLiteralComment:
   EnforcedStyle: always_true
 
 Style/SpecialGlobalVars:
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/358427
-  EnforcedStyle: use_perl_names
+  EnforcedStyle: use_builtin_english_names
 
 RSpec/FilePath:
   Exclude:

.rubocop_todo/gitlab/service_response.yml

@@ -15,6 +15,7 @@ Gitlab/ServiceResponse:
     - 'app/services/ci/retry_pipeline_service.rb'
     - 'app/services/ci/runners/assign_runner_service.rb'
     - 'app/services/ci/runners/register_runner_service.rb'
+    - 'app/services/ci/runners/set_runner_associated_projects_service.rb'
     - 'app/services/concerns/alert_management/responses.rb'
     - 'app/services/concerns/services/return_service_responses.rb'
     - 'app/services/container_expiration_policies/update_service.rb'
@@ -64,15 +65,18 @@ Gitlab/ServiceResponse:
     - 'ee/app/services/vulnerability_issue_links/create_service.rb'
     - 'ee/app/services/vulnerability_issue_links/delete_service.rb'
     - 'ee/spec/graphql/mutations/security/finding/dismiss_spec.rb'
+    - 'spec/controllers/boards/issues_controller_spec.rb'
     - 'spec/controllers/import/bulk_imports_controller_spec.rb'
     - 'spec/controllers/import/fogbugz_controller_spec.rb'
     - 'spec/controllers/projects/alerting/notifications_controller_spec.rb'
+    - 'spec/controllers/projects/issues_controller_spec.rb'
     - 'spec/controllers/projects/pipelines_controller_spec.rb'
     - 'spec/controllers/projects/prometheus/alerts_controller_spec.rb'
     - 'spec/lib/gitlab/import_export/snippet_repo_restorer_spec.rb'
     - 'spec/requests/api/ci/pipelines_spec.rb'
     - 'spec/requests/api/ci/runner/runners_post_spec.rb'
     - 'spec/requests/api/group_export_spec.rb'
+    - 'spec/requests/api/issues/issues_spec.rb'
     - 'spec/requests/api/project_export_spec.rb'
     - 'spec/requests/api/project_import_spec.rb'
     - 'spec/requests/projects/incident_management/pagerduty_incidents_spec.rb'

.rubocop_todo/style/special_global_vars.yml

+---
+# Cop supports --auto-correct.
+Style/SpecialGlobalVars:
+  Details: grace period

GITLAB_ELASTICSEARCH_INDEXER_VERSION

-3.0.2
+3.0.3

Gemfile

@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 
 if ENV['BUNDLER_CHECKSUM_VERIFICATION_OPT_IN'] # this verification is still experimental
-  $:.unshift(File.expand_path("vendor/gems/bundler-checksum/lib", __dir__))
+  $LOAD_PATH.unshift(File.expand_path("vendor/gems/bundler-checksum/lib", __dir__))
   require 'bundler-checksum'
   Bundler::Checksum.patch!
 end

app/assets/javascripts/groups_select.js

 import $ from 'jquery';
 import { escape } from 'lodash';
+import { groupsPath } from '~/vue_shared/components/group_select/utils';
 import { __ } from '~/locale';
 import Api from './api';
 import { loadCSSFile } from './lib/utils/css_utils';
 import { select2AxiosTransport } from './lib/utils/select2_utils';
 
-const groupsPath = (groupsFilter, parentGroupID) => {
-  switch (groupsFilter) {
-    case 'descendant_groups':
-      return Api.descendantGroupsPath.replace(':id', parentGroupID);
-    case 'subgroups':
-      return Api.subgroupsPath.replace(':id', parentGroupID);
-    default:
-      return Api.groupsPath;
-  }
-};
-
 const groupsSelect = () => {
   loadCSSFile(gon.select2_css_path)
     .then(() => {

app/assets/javascripts/issues/show/components/edited.vue

@@ -41,7 +41,7 @@ export default {
     </gl-sprintf>
     <gl-sprintf v-else-if="!updatedAt" :message="__('Edited by %{author}')">
       <template #author>
-        <a :href="updatedByPath" class="author-link">
+        <a :href="updatedByPath" class="author-link gl-hover-text-decoration-underline">
           <span>{{ updatedByName }}</span>
         </a>
       </template>
@@ -51,7 +51,7 @@ export default {
         <time-ago-tooltip :time="updatedAt" tooltip-placement="bottom" />
       </template>
       <template #author>
-        <a :href="updatedByPath" class="author-link">
+        <a :href="updatedByPath" class="author-link gl-hover-text-decoration-underline">
           <span>{{ updatedByName }}</span>
         </a>
       </template>

app/assets/javascripts/issues/show/components/header_actions.vue

@@ -229,7 +229,7 @@ export default {
 </script>
 
 <template>
-  <div class="detail-page-header-actions gl-display-flex">
+  <div class="detail-page-header-actions gl-display-flex gl-align-self-start">
     <gl-dropdown
       v-if="hasMobileDropdown"
       class="gl-sm-display-none! w-100"

app/assets/javascripts/runner/components/runner_bulk_delete_checkbox.vue

 <script>
 import { GlFormCheckbox } from '@gitlab/ui';
+import { s__ } from '~/locale';
 import checkedRunnerIdsQuery from '../graphql/list/checked_runner_ids.query.graphql';
 
 export default {
@@ -34,6 +35,9 @@ export default {
     indeterminate() {
       return !this.checked && this.runners.some(this.isChecked);
     },
+    label() {
+      return this.checked ? s__('Runners|Unselect all') : s__('Runners|Select all');
+    },
   },
   methods: {
     isChecked({ id }) {
@@ -51,6 +55,7 @@ export default {
 
 <template>
   <gl-form-checkbox
+    :aria-label="label"
     :indeterminate="indeterminate"
     :checked="checked"
     :disabled="disabled"

app/assets/javascripts/search/index.js

 import setHighlightClass from 'ee_else_ce/search/highlight_blob_search_result';
 import { queryToObject } from '~/lib/utils/url_utility';
 import refreshCounts from '~/pages/search/show/refresh_counts';
-import { initSidebar } from './sidebar';
+import { initSidebar, sidebarInitState } from './sidebar';
 import { initSearchSort } from './sort';
 import createStore from './store';
 import { initTopbar } from './topbar';
@@ -9,14 +9,18 @@ import { initBlobRefSwitcher } from './under_topbar';
 
 export const initSearchApp = () => {
   const query = queryToObject(window.location.search);
+  const navigation = sidebarInitState();
 
-  const store = createStore({ query });
+  const store = createStore({ query, navigation });
 
   initTopbar(store);
   initSidebar(store);
   initSearchSort(store);
 
   setHighlightClass(query.search); // Code Highlighting
-  refreshCounts(); // Other Scope Tab Counts
   initBlobRefSwitcher(); // Code Search Branch Picker
+
+  if (!gon.features?.searchPageVerticalNav) {
+    refreshCounts(); // Other Scope Tab Counts
+  }
 };

app/assets/javascripts/search/sidebar/components/app.vue

@@ -17,6 +17,9 @@ export default {
     showReset() {
       return this.urlQuery.state || this.urlQuery.confidential;
     },
+    showSidebar() {
+      return this.urlQuery.scope === 'issues' || this.urlQuery.scope === 'merge_requests';
+    },
   },
   methods: {
     ...mapActions(['applyQuery', 'resetQuery']),
@@ -29,15 +32,17 @@ export default {
     class="search-sidebar gl-display-flex gl-flex-direction-column gl-mr-4 gl-mb-6 gl-mt-5"
     @submit.prevent="applyQuery"
   >
-    <status-filter />
-    <confidentiality-filter />
-    <div class="gl-display-flex gl-align-items-center gl-mt-3">
-      <gl-button category="primary" variant="confirm" type="submit" :disabled="!sidebarDirty">
-        {{ __('Apply') }}
-      </gl-button>
-      <gl-link v-if="showReset" class="gl-ml-auto" @click="resetQuery">{{
-        __('Reset filters')
-      }}</gl-link>
-    </div>
+    <template v-if="showSidebar">
+      <status-filter />
+      <confidentiality-filter />
+      <div class="gl-display-flex gl-align-items-center gl-mt-3">
+        <gl-button category="primary" variant="confirm" type="submit" :disabled="!sidebarDirty">
+          {{ __('Apply') }}
+        </gl-button>
+        <gl-link v-if="showReset" class="gl-ml-auto" @click="resetQuery">{{
+          __('Reset filters')
+        }}</gl-link>
+      </div>
+    </template>
   </form>
 </template>

app/assets/javascripts/search/sidebar/index.js

@@ -4,6 +4,15 @@ import GlobalSearchSidebar from './components/app.vue';
 
 Vue.use(Translate);
 
+export const sidebarInitState = () => {
+  const el = document.getElementById('js-search-sidebar');
+
+  if (!el) return {};
+
+  const { navigation } = el.dataset;
+  return JSON.parse(navigation);
+};
+
 export const initSidebar = (store) => {
   const el = document.getElementById('js-search-sidebar');
 

app/assets/javascripts/search/topbar/components/app.vue

 <script>
 import { GlSearchBoxByClick } from '@gitlab/ui';
 import { mapState, mapActions } from 'vuex';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { s__ } from '~/locale';
+import { parseBoolean } from '~/lib/utils/common_utils';
 import GroupFilter from './group_filter.vue';
 import ProjectFilter from './project_filter.vue';
 
@@ -16,6 +18,7 @@ export default {
     GroupFilter,
     ProjectFilter,
   },
+  mixins: [glFeatureFlagsMixin()],
   props: {
     groupInitialData: {
       type: Object,
@@ -39,7 +42,10 @@ export default {
       },
     },
     showFilters() {
-      return !this.query.snippets || this.query.snippets === 'false';
+      return !parseBoolean(this.query.snippets);
+    },
+    hasVerticalNav() {
+      return this.glFeatures.searchPageVerticalNav;
     },
   },
   created() {
@@ -52,24 +58,27 @@ export default {
 </script>
 
 <template>
-  <section class="search-page-form gl-lg-display-flex gl-align-items-flex-end">
-    <div class="gl-flex-grow-1 gl-mb-4 gl-lg-mb-0 gl-lg-mr-2">
-      <label>{{ $options.i18n.searchLabel }}</label>
-      <gl-search-box-by-click
-        id="dashboard_search"
-        v-model="search"
-        name="search"
-        :placeholder="$options.i18n.searchPlaceholder"
-        @submit="applyQuery"
-      />
-    </div>
-    <div v-if="showFilters" class="gl-mb-4 gl-lg-mb-0 gl-lg-mx-2">
-      <label class="gl-display-block">{{ __('Group') }}</label>
-      <group-filter :initial-data="groupInitialData" />
-    </div>
-    <div v-if="showFilters" class="gl-mb-4 gl-lg-mb-0 gl-lg-mx-2">
-      <label class="gl-display-block">{{ __('Project') }}</label>
-      <project-filter :initial-data="projectInitialData" />
+  <section class="search-page-form gl-lg-display-flex gl-flex-direction-column">
+    <div class="gl-lg-display-flex gl-flex-direction-row gl-align-items-flex-end">
+      <div class="gl-flex-grow-1 gl-mb-4 gl-lg-mb-0 gl-lg-mr-2">
+        <label>{{ $options.i18n.searchLabel }}</label>
+        <gl-search-box-by-click
+          id="dashboard_search"
+          v-model="search"
+          name="search"
+          :placeholder="$options.i18n.searchPlaceholder"
+          @submit="applyQuery"
+        />
+      </div>
+      <div v-if="showFilters" class="gl-mb-4 gl-lg-mb-0 gl-lg-mx-2">
+        <label class="gl-display-block">{{ __('Group') }}</label>
+        <group-filter :initial-data="groupInitialData" />
+      </div>
+      <div v-if="showFilters" class="gl-mb-4 gl-lg-mb-0 gl-lg-mx-2">
+        <label class="gl-display-block">{{ __('Project') }}</label>
+        <project-filter :initial-data="projectInitialData" />
+      </div>
     </div>
+    <hr v-if="hasVerticalNav" class="gl-mt-5 gl-mb-0 gl-border-gray-100" />
   </section>
 </template>

app/assets/javascripts/vue_shared/components/confidentiality_badge.vue

@@ -33,7 +33,7 @@ export default {
     :title="confidentialTooltip"
     icon="eye-slash"
     variant="warning"
-    class="gl-display-inline gl-mr-2"
+    class="gl-display-inline gl-mr-3"
     >{{ __('Confidential') }}</gl-badge
   >
 </template>

app/assets/javascripts/vue_shared/components/group_select/utils.js

+import Api from '~/api';
+
+export const groupsPath = (groupsFilter, parentGroupID) => {
+  if (groupsFilter !== undefined && parentGroupID === undefined) {
+    throw new Error('Cannot use groupsFilter without a parentGroupID');
+  }
+  switch (groupsFilter) {
+    case 'descendant_groups':
+      return Api.descendantGroupsPath.replace(':id', parentGroupID);
+    case 'subgroups':
+      return Api.subgroupsPath.replace(':id', parentGroupID);
+    default:
+      return Api.groupsPath;
+  }
+};

app/assets/javascripts/work_items/components/work_item_description.vue

@@ -5,6 +5,7 @@ import { helpPagePath } from '~/helpers/help_page_helper';
 import { getDraft, clearDraft, updateDraft } from '~/lib/utils/autosave';
 import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal';
 import { __, s__ } from '~/locale';
+import EditedAt from '~/issues/show/components/edited.vue';
 import Tracking from '~/tracking';
 import MarkdownField from '~/vue_shared/components/markdown/field.vue';
 import workItemQuery from '../graphql/work_item.query.graphql';
@@ -16,6 +17,7 @@ export default {
     SafeHtml: GlSafeHtmlDirective,
   },
   components: {
+    EditedAt,
     GlButton,
     GlFormGroup,
     MarkdownField,
@@ -89,6 +91,15 @@ export default {
     workItemType() {
       return this.workItem?.workItemType?.name;
     },
+    lastEditedAt() {
+      return this.workItemDescription?.lastEditedAt;
+    },
+    lastEditedByName() {
+      return this.workItemDescription?.lastEditedBy?.name;
+    },
+    lastEditedByPath() {
+      return this.workItemDescription?.lastEditedBy?.webPath;
+    },
     markdownPreviewPath() {
       return `${gon.relative_url_root || ''}/${this.fullPath}/preview_markdown?target_type=${
         this.workItemType
@@ -235,5 +246,11 @@ export default {
 
     <div v-if="descriptionEmpty" class="gl-text-secondary gl-mb-5">{{ __('None') }}</div>
     <div v-else v-safe-html="descriptionHtml" class="md gl-mb-5 gl-min-h-8"></div>
+    <edited-at
+      v-if="lastEditedAt"
+      :updated-at="lastEditedAt"
+      :updated-by-name="lastEditedByName"
+      :updated-by-path="lastEditedByPath"
+    />
   </div>
 </template>

app/assets/javascripts/work_items/graphql/work_item_widgets.fragment.graphql

@@ -6,6 +6,11 @@ fragment WorkItemWidgets on WorkItemWidget {
     type
     description
     descriptionHtml
+    lastEditedAt
+    lastEditedBy {
+      name
+      webPath
+    }
   }
   ... on WorkItemWidgetAssignees {
     type

app/controllers/boards/application_controller.rb

-# frozen_string_literal: true
-
-module Boards
-  class ApplicationController < ::ApplicationController
-    respond_to :json
-
-    rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
-
-    private
-
-    def board
-      @board ||= Board.find(params[:board_id])
-    end
-
-    def board_parent
-      @board_parent ||= board.resource_parent
-    end
-
-    def record_not_found(exception)
-      render json: { error: exception.message }, status: :not_found
-    end
-  end
-end