Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

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

@@ -503,6 +503,12 @@
 .frontend-predictive-patterns: &frontend-predictive-patterns
   - "{,ee/,jh/}{app/assets/javascripts,spec/frontend}/**/*"
 
+.frontend-code-patterns: &frontend-code-patterns
+  - "**/{package.json,yarn.lock}"
+  - "**/*.{js,cjs,mjs,vue,graphql}"
+  # match the .rc config files like .browserslistrc, .stylelintrc etc.,
+  - "{.,}*rc"
+
 # Code patterns + .ci-patterns
 .code-patterns: &code-patterns
   - ".{gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
@@ -1387,6 +1393,23 @@
     - <<: *if-default-refs
       changes: *workhorse-patterns
 
+.frontend:rules:eslint-changed-files:
+  rules:
+    - <<: *if-merge-request-labels-pipeline-expedite
+      when: never
+    - <<: *if-default-branch-refs
+      when: never
+    - !reference [".prevent-tier-2-and-above", "rules"]
+    - <<: *if-merge-request-no-tier
+      changes: *frontend-code-patterns
+    - <<: *if-merge-request-tier-1
+      changes: *frontend-code-patterns
+
+.frontend:rules:eslint-default:
+  rules:
+    - !reference [".prevent-tier-1", "rules"]
+    - !reference [.frontend:rules:default-frontend-jobs, rules]
+
 .frontend:rules:default-frontend-jobs:
   rules:
     - <<: *if-merge-request-labels-pipeline-expedite

.gitlab/ci/static-analysis.gitlab-ci.yml

@@ -69,15 +69,22 @@ generate-apollo-graphql-schema:
     paths:
       - "${GRAPHQL_SCHEMA_APOLLO_FILE}"
 
-eslint:
+.eslint-base:
   extends:
     - .static-analysis-base
     - .yarn-cache
-    - .frontend:rules:default-frontend-jobs
   needs: ['generate-apollo-graphql-schema']
   variables:
     USE_BUNDLE_INSTALL: "false"
     ESLINT_CODE_QUALITY_REPORT: "gl-code-quality-report.json"
+  artifacts:
+    reports:
+      codequality: gl-code-quality-report.json
+
+eslint-changed-files:
+  extends:
+    - .eslint-base
+    - .frontend:rules:eslint-changed-files
   script:
     - |
       function eslint_script() {
@@ -87,9 +94,18 @@ eslint:
 
       run_with_custom_exit_code eslint_script
 
-  artifacts:
-    reports:
-      codequality: gl-code-quality-report.json
+eslint:
+  extends:
+    - .eslint-base
+    - .frontend:rules:eslint-default
+  script:
+    - |
+      function eslint_script() {
+        yarn_install_script
+        yarn run lint:eslint:all --format gitlab
+      }
+
+      run_with_custom_exit_code eslint_script
 
 eslint-docs:
   extends:

GITALY_SERVER_VERSION

@@ -1 +1 @@
-5603e4787366e8a2b02491ab921364627efc3ed3
+e1930fa23a9c7548bdd5af3dc938ab0bb4075db7

app/assets/javascripts/groups_projects/components/tabs_with_list.vue

@@ -270,7 +270,7 @@ export default {
         return;
       }
 
-      this.trackEvent(this.eventTracking.tabs, { label: tab.text });
+      this.trackEvent(this.eventTracking.tabs, { label: tab.value });
     },
     tabCount(tab) {
       return this.tabCounts[tab.value];
@@ -296,7 +296,7 @@ export default {
         return;
       }
 
-      this.trackEvent(this.eventTracking.sort, { label: this.activeTab.text, property: sort });
+      this.trackEvent(this.eventTracking.sort, { label: this.activeTab.value, property: sort });
     },
     onFilter(filters) {
       const { sort } = this.$route.query;
@@ -317,38 +317,14 @@ export default {
         // Don't record the value when using text search.
         // Only record with pre-set values (e.g language or access level).
         if (filter === this.filteredSearchTermKey) {
-          this.trackEvent(event, { label: this.activeTab.text });
+          this.trackEvent(event, { label: this.activeTab.value });
 
           return;
         }
 
-        const filteredSearchToken = this.filteredSearchTokens.find(
-          (token) => token.type === filter,
-        );
-
-        if (!filteredSearchToken) {
-          return;
-        }
-
-        const optionTitles = filterValues.flatMap((filterValue) => {
-          const optionTitle = filteredSearchToken.options.find(
-            ({ value }) => filterValue === value,
-          )?.title;
-
-          if (!optionTitle) {
-            return [];
-          }
-
-          return [optionTitle];
-        });
-
-        if (!optionTitles.length) {
-          return;
-        }
-
         this.trackEvent(event, {
-          label: this.activeTab.text,
-          property: optionTitles.join(','),
+          label: this.activeTab.value,
+          property: filterValues.join(','),
         });
       });
     },
@@ -362,7 +338,7 @@ export default {
       }
 
       this.trackEvent(this.eventTracking.pagination, {
-        label: this.activeTab.text,
+        label: this.activeTab.value,
         property: pagination.startCursor === null ? 'next' : 'previous',
       });
     },

app/assets/javascripts/merge_requests/components/reviewers/reviewer_dropdown.vue

@@ -4,6 +4,7 @@ import { GlCollapsibleListbox, GlButton, GlAvatar, GlIcon } from '@gitlab/ui';
 import { __ } from '~/locale';
 import { InternalEvents } from '~/tracking';
 import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants';
+import { uuids } from '~/lib/utils/uuids';
 import { TYPENAME_MERGE_REQUEST } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import userAutocompleteWithMRPermissionsQuery from '~/graphql_shared/queries/project_autocomplete_users_with_mr_permissions.query.graphql';
@@ -14,6 +15,11 @@ import {
   SEARCH_SELECT_REVIEWER_EVENT,
   SELECT_REVIEWER_EVENT,
 } from '../../constants';
+import {
+  getReviewersForList,
+  suggestedPosition,
+  setReviewersForList,
+} from '../../utils/reviewer_positions';
 
 import UpdateReviewers from './update_reviewers.vue';
 import userPermissionsQuery from './queries/user_permissions.query.graphql';
@@ -66,6 +72,11 @@ export default {
       required: false,
       default: () => 'complex',
     },
+    uniqueId: {
+      type: String,
+      required: false,
+      default: () => uuids()[0],
+    },
   },
   data() {
     return {
@@ -159,6 +170,17 @@ export default {
         },
       });
 
+      if (!search) {
+        const theseUsers = toUsernames(users);
+        const newOptions = difference(theseUsers, this.currentSelectedReviewers);
+
+        setReviewersForList({
+          issuableId: this.issuableId,
+          listId: this.uniqueId,
+          reviewers: newOptions,
+        });
+      }
+
       this.fetchedUsers = users;
       this.searching = false;
     },
@@ -169,6 +191,10 @@ export default {
       const telemetryEvent = this.search ? SEARCH_SELECT_REVIEWER_EVENT : SELECT_REVIEWER_EVENT;
       const previousUsernames = toUsernames(this.selectedReviewers);
       const listUsernames = toUsernames(this.usersForList);
+      const suggested = getReviewersForList({
+        issuableId: this.issuableId,
+        listId: this.uniqueId,
+      });
       // Reviewers are always shown first if they are in the list,
       // so we should exclude them for when we check the position
       const selectableList = difference(listUsernames, previousUsernames);
@@ -177,9 +203,11 @@ export default {
       additions.forEach((added) => {
         // Convert from 0- to 1-index
         const listPosition = selectableList.findIndex((user) => user === added) + 1;
+        const suggestedPos = suggestedPosition({ username: added, list: suggested });
 
         this.trackEvent(telemetryEvent, {
           value: listPosition,
+          suggested_position: suggestedPos,
           selectable_reviewers_count: selectableList.length,
         });
       });

app/assets/javascripts/merge_requests/utils/reviewer_positions.js

@@ -0,0 +1,20 @@
+function cacheId({ issuableId, listId } = {}) {
+  return `MergeRequest/${issuableId}/${listId}`;
+}
+
+export function setReviewersForList({ issuableId, listId, reviewers = [] } = {}) {
+  const id = cacheId({ issuableId, listId });
+
+  window.sessionStorage.setItem(id, JSON.stringify(reviewers, null, 0));
+}
+
+export function getReviewersForList({ issuableId, listId } = {}) {
+  const id = cacheId({ issuableId, listId });
+  const list = window.sessionStorage.getItem(id);
+
+  return list ? JSON.parse(list) : [];
+}
+
+export function suggestedPosition({ username, list = [] } = {}) {
+  return list.indexOf(username) + 1; // 1-index, so that "0" means they weren't in the list
+}

app/assets/javascripts/repository/components/header_area/blob_controls.vue

@@ -282,14 +282,13 @@ export default {
 <template>
   <div
     v-if="showBlobControls"
-    class="gl-flex gl-flex-wrap gl-items-center gl-gap-3"
+    class="gl-flex gl-flex-wrap gl-items-center gl-gap-3 gl-self-end"
     data-testid="blob-controls"
   >
     <open-mr-badge
       v-if="glFeatures.filterBlobPath"
       :project-path="projectPath"
       :blob-path="filePath"
-      class="!gl-ml-auto"
     />
     <gl-button
       v-gl-tooltip.html="findFileTooltip"

app/assets/javascripts/sidebar/components/time_tracking/create_timelog_form.vue

@@ -10,7 +10,7 @@ import {
 } from '@gitlab/ui';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { issuableTypeText, TYPE_ISSUE } from '~/issues/constants';
-import { toISODateFormat } from '~/lib/utils/datetime_utility';
+import { toISOStringWithoutMilliseconds } from '~/lib/utils/datetime_utility';
 import { TYPENAME_ISSUE, TYPENAME_MERGE_REQUEST } from '~/graphql_shared/constants';
 import { joinPaths } from '~/lib/utils/url_utility';
 import { s__, sprintf } from '~/locale';
@@ -115,6 +115,13 @@ export default {
       this.isLoading = true;
       this.saveError = '';
 
+      let isoSpentAt = null;
+      if (this.spentAt) {
+        const spentAtMidday = this.spentAt;
+        spentAtMidday.setHours(spentAtMidday.getHours() + 12);
+        isoSpentAt = toISOStringWithoutMilliseconds(spentAtMidday);
+      }
+
       if (this.workItemId) {
         return this.$apollo
           .mutate({
@@ -124,7 +131,7 @@ export default {
                 id: this.workItemId,
                 timeTrackingWidget: {
                   timelog: {
-                    spentAt: this.spentAt ? toISODateFormat(this.spentAt) : null,
+                    spentAt: isoSpentAt,
                     summary: this.summary,
                     timeSpent: this.timeSpent,
                   },
@@ -155,7 +162,7 @@ export default {
           variables: {
             input: {
               timeSpent: this.timeSpent,
-              spentAt: this.spentAt ? toISODateFormat(this.spentAt) : null,
+              spentAt: isoSpentAt,
               summary: this.summary,
               issuableId: this.getIssuableId(),
             },

app/finders/database/batched_background_migrations_finder.rb

@@ -4,24 +4,52 @@ module Database
   class BatchedBackgroundMigrationsFinder
     RETURNED_MIGRATIONS = 20
 
-    def initialize(connection:)
-      @connection = connection
+    def initialize(params:)
+      @params = params
     end
 
     def execute
-      batched_migration_class.ordered_by_created_at_desc.for_gitlab_schema(schema).limit(RETURNED_MIGRATIONS)
+      raise ArgumentError, 'database parameter is required' if params[:database].blank?
+
+      return batched_migration_class.none unless Gitlab::Database.has_config?(database_name)
+
+      @migrations = migrations
+
+      filter_by_job_class_name
+
+      @migrations.limit(RETURNED_MIGRATIONS)
     end
 
     private
 
-    attr_accessor :connection
+    attr_reader :params
+
+    def migrations
+      batched_migration_class
+        .ordered_by_created_at_desc
+        .for_gitlab_schema(schema)
+    end
+
+    def filter_by_job_class_name
+      return unless params[:job_class_name].present?
+
+      @migrations = @migrations.for_job_class(params[:job_class_name])
+    end
 
     def batched_migration_class
       Gitlab::Database::BackgroundMigration::BatchedMigration
     end
 
     def schema
-      Gitlab::Database.gitlab_schemas_for_connection(connection)
+      Gitlab::Database.gitlab_schemas_for_connection(base_model.connection)
+    end
+
+    def base_model
+      Gitlab::Database.database_base_models[database_name]
+    end
+
+    def database_name
+      params[:database]
     end
   end
 end

config/events/click_pagination_on_your_work_projects.yml

@@ -6,7 +6,7 @@ identifiers:
 - user
 additional_properties:
   label:
-    description: Tab name (e.g. "Contributed")
+    description: Tab name (e.g. "contributed")
   property:
     description: Direction
 product_group: organizations

config/events/click_sort_on_your_work_projects.yml

@@ -6,7 +6,7 @@ identifiers:
 - user
 additional_properties:
   label:
-    description: Tab name (e.g. "Contributed")
+    description: Tab name (e.g. "contributed")
   property:
     description: Sort value
 product_group: organizations

config/events/click_tab_on_your_work_projects.yml

@@ -6,7 +6,7 @@ identifiers:
 - user
 additional_properties:
   label:
-    description: Tab name (e.g. "Contributed")
+    description: Tab name (e.g. "contributed")
 product_group: organizations
 product_categories:
 - groups_and_projects