.gitlab/CODEOWNERS

@@ -159,6 +159,7 @@
 /lib/gitlab/github_import/ @gitlab-org/maintainers/database
 /app/finders/ @gitlab-org/maintainers/database
 /ee/app/finders/ @gitlab-org/maintainers/database
+/rubocop/rubocop-migrations.yml @gitlab-org/maintainers/database
 
 [Engineering Productivity]
 /.gitlab-ci.yml @gl-quality/eng-prod

.gitlab/ci/docs.gitlab-ci.yml

@@ -70,8 +70,8 @@ docs-lint links:
     # Don't delete the documentation/index.md, which is a false positive for the simple grep.
     - grep -rl "redirect_to:" /tmp/gitlab-docs/content/ee/ | grep -v "development/documentation/index.md" | xargs rm -f
     - bundle exec nanoc
-    - echo -e "\e[96mThe following test fails when a doc links to a redirect file."
-    - echo -e "\e[96mMake sure all links point to the correct page."
+    - echo -e "\e[1;96mThe following test fails when a doc links to a redirect file."
+    - echo -e "\e[1;96mMake sure all links point to the correct page."
     - bundle exec nanoc check internal_links
     # Check the internal anchor links
     - bundle exec nanoc check internal_anchors

.gitlab/issue_templates/actionable_insight.md

@@ -31,5 +31,4 @@ Actionable insights always have a follow-up action that needs to take place as a
 
 
 
-
- /label ~"Actionable Insight" 
+/label ~"Actionable Insight"

.rubocop_manual_todo.yml

@@ -21,7 +21,6 @@ Graphql/IDType:
   Exclude:
     - 'ee/app/graphql/ee/mutations/issues/update.rb'
     - 'app/graphql/mutations/boards/issues/issue_move_list.rb'
-    - 'app/graphql/mutations/metrics/dashboard/annotations/delete.rb'
     - 'app/graphql/resolvers/design_management/design_at_version_resolver.rb'
     - 'app/graphql/resolvers/design_management/design_resolver.rb'
     - 'app/graphql/resolvers/design_management/designs_resolver.rb'

GITALY_SERVER_VERSION

-add5f3dd182c99b4d9e1cf93e45fec1214c00659
+2eb4db13dab06b87382582f5fcddab0c8397463e

Gemfile

@@ -466,7 +466,7 @@ group :ed25519 do
 end
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.6.1'
+gem 'gitaly', '~> 13.7.0.pre.rc1'
 
 gem 'grpc', '~> 1.30.2'
 

Gemfile.lock

@@ -422,7 +422,7 @@ GEM
       rails (>= 3.2.0)
     git (1.7.0)
       rchardet (~> 1.8)
-    gitaly (13.6.1)
+    gitaly (13.7.0.pre.rc1)
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab-chronic (0.10.5)
@@ -1349,7 +1349,7 @@ DEPENDENCIES
   gettext (~> 3.3)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 13.6.1)
+  gitaly (~> 13.7.0.pre.rc1)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
   gitlab-fog-azure-rm (~> 1.0)

app/assets/javascripts/api.js

@@ -69,6 +69,7 @@ const Api = {
   issuePath: '/api/:version/projects/:id/issues/:issue_iid',
   tagsPath: '/api/:version/projects/:id/repository/tags',
   freezePeriodsPath: '/api/:version/projects/:id/freeze_periods',
+  usageDataIncrementCounterPath: '/api/:version/usage_data/increment_counter',
   usageDataIncrementUniqueUsersPath: '/api/:version/usage_data/increment_unique_users',
   featureFlagUserLists: '/api/:version/projects/:id/feature_flags_user_lists',
   featureFlagUserList: '/api/:version/projects/:id/feature_flags_user_lists/:list_iid',
@@ -751,6 +752,19 @@ const Api = {
     return axios.post(url, freezePeriod);
   },
 
+  trackRedisCounterEvent(event) {
+    if (!gon.features?.usageDataApi) {
+      return null;
+    }
+
+    const url = Api.buildUrl(this.usageDataIncrementCounterPath);
+    const headers = {
+      'Content-Type': 'application/json',
+    };
+
+    return axios.post(url, { event }, { headers });
+  },
+
   trackRedisHllUserEvent(event) {
     if (!gon.features?.usageDataApi) {
       return null;

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

@@ -14,7 +14,7 @@ import IssuableAssignees from '~/sidebar/components/assignees/issuable_assignees
 import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue';
 import MultiSelectDropdown from '~/vue_shared/components/sidebar/multiselect_dropdown.vue';
 import getIssueParticipants from '~/vue_shared/components/sidebar/queries/getIssueParticipants.query.graphql';
-import searchUsers from '~/boards/queries/users_search.query.graphql';
+import searchUsers from '~/boards/graphql/users_search.query.graphql';
 
 export default {
   noSearchDelay: 0,

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

@@ -12,8 +12,8 @@ import {
 import httpStatusCodes from '~/lib/utils/http_status';
 
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import projectQuery from '../queries/project_boards.query.graphql';
-import groupQuery from '../queries/group_boards.query.graphql';
+import projectQuery from '../graphql/project_boards.query.graphql';
+import groupQuery from '../graphql/group_boards.query.graphql';
 
 import boardsStore from '../stores/boards_store';
 import BoardForm from './board_form.vue';

app/assets/javascripts/boards/components/sidebar/board_sidebar_milestone_select.vue

@@ -10,7 +10,7 @@ import {
 } from '@gitlab/ui';
 import { fetchPolicies } from '~/lib/graphql';
 import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue';
-import groupMilestones from '../../queries/group_milestones.query.graphql';
+import groupMilestones from '../../graphql/group_milestones.query.graphql';
 import createFlash from '~/flash';
 import { __, s__ } from '~/locale';
 

app/assets/javascripts/boards/queries/board_list_create.mutation.graphql → app/assets/javascripts/boards/graphql/board_list_create.mutation.graphql

-#import "ee_else_ce/boards/queries/board_list.fragment.graphql"
+#import "ee_else_ce/boards/graphql/board_list.fragment.graphql"
 
 mutation CreateBoardList(
   $boardId: BoardID!

app/assets/javascripts/boards/queries/board_lists.query.graphql → app/assets/javascripts/boards/graphql/board_lists.query.graphql

-#import "ee_else_ce/boards/queries/board_list.fragment.graphql"
+#import "ee_else_ce/boards/graphql/board_list.fragment.graphql"
 
 query ListIssues(
   $fullPath: ID!