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

@@ -35,6 +35,17 @@ static-analysis:
     paths:
       - tmp/feature_flags/
 
+static-analysis-with-database:
+  extends:
+    - .static-analysis-base
+    - .static-analysis:rules:ee-and-foss
+    - .use-pg12
+  stage: test
+  script:
+    - bundle exec rake lint:static_verification_with_database
+  variables:
+    SETUP_DB: "true"
+
 static-analysis as-if-foss:
   extends:
     - static-analysis

CHANGELOG.md

@@ -2,6 +2,16 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
+## 14.3.2 (2021-10-01)
+
+### Fixed (1 change)
+
+- [Update GitLab Shell to v13.21.1](gitlab-org/gitlab@9e9e41f2ae9bdb89355c0f9cef486950bbaf361c) ([merge request](gitlab-org/gitlab!71513))
+
+### Changed (1 change)
+
+- [Remove `async_filtering` feature flag](gitlab-org/gitlab@c4277c1fed0de3d86694390641612bfcde30cc92) ([merge request](gitlab-org/gitlab!71513))
+
 ## 14.3.1 (2021-09-30)
 ### Security (29 changes)

GITLAB_ELASTICSEARCH_INDEXER_VERSION

-2.14.0
+2.15.0

app/assets/javascripts/admin/users/components/actions/delete.vue

@@ -14,7 +14,7 @@ export default {
       type: Object,
       required: true,
     },
-    oncallSchedules: {
+    userDeletionObstacles: {
       type: Array,
       required: false,
       default: () => [],
@@ -29,7 +29,7 @@ export default {
     :username="username"
     :paths="paths"
     :delete-path="paths.delete"
-    :oncall-schedules="oncallSchedules"
+    :user-deletion-obstacles="userDeletionObstacles"
   >
     <slot></slot>
   </shared-delete-action>

app/assets/javascripts/admin/users/components/actions/delete_with_contributions.vue

@@ -14,7 +14,7 @@ export default {
       type: Object,
       required: true,
     },
-    oncallSchedules: {
+    userDeletionObstacles: {
       type: Array,
       required: false,
       default: () => [],
@@ -29,7 +29,7 @@ export default {
     :username="username"
     :paths="paths"
     :delete-path="paths.deleteWithContributions"
-    :oncall-schedules="oncallSchedules"
+    :user-deletion-obstacles="userDeletionObstacles"
   >
     <slot></slot>
   </shared-delete-action>

app/assets/javascripts/admin/users/components/actions/shared/shared_delete_action.vue

@@ -22,7 +22,7 @@ export default {
       type: String,
       required: true,
     },
-    oncallSchedules: {
+    userDeletionObstacles: {
       type: Array,
       required: true,
     },
@@ -34,7 +34,7 @@ export default {
         'data-delete-user-url': this.deletePath,
         'data-gl-modal-action': this.modalType,
         'data-username': this.username,
-        'data-oncall-schedules': JSON.stringify(this.oncallSchedules),
+        'data-user-deletion-obstacles': JSON.stringify(this.userDeletionObstacles),
       };
     },
   },

app/assets/javascripts/admin/users/components/modals/delete_user_modal.vue

@@ -2,7 +2,7 @@
 import { GlModal, GlButton, GlFormInput, GlSprintf } from '@gitlab/ui';
 import * as Sentry from '@sentry/browser';
 import { s__, sprintf } from '~/locale';
-import OncallSchedulesList from '~/vue_shared/components/oncall_schedules_list.vue';
+import UserDeletionObstaclesList from '~/vue_shared/components/user_deletion_obstacles/user_deletion_obstacles_list.vue';
 
 export default {
   components: {
@@ -10,7 +10,7 @@ export default {
     GlButton,
     GlFormInput,
     GlSprintf,
-    OncallSchedulesList,
+    UserDeletionObstaclesList,
   },
   props: {
     title: {
@@ -45,7 +45,7 @@ export default {
       type: String,
       required: true,
     },
-    oncallSchedules: {
+    userDeletionObstacles: {
       type: String,
       required: false,
       default: '[]',
@@ -66,9 +66,9 @@ export default {
     canSubmit() {
       return this.enteredUsername === this.username;
     },
-    schedules() {
+    obstacles() {
       try {
-        return JSON.parse(this.oncallSchedules);
+        return JSON.parse(this.userDeletionObstacles);
       } catch (e) {
         Sentry.captureException(e);
       }
@@ -112,12 +112,16 @@ export default {
       </gl-sprintf>
     </p>
 
-    <oncall-schedules-list v-if="schedules.length" :schedules="schedules" :user-name="username" />
+    <user-deletion-obstacles-list
+      v-if="obstacles.length"
+      :obstacles="obstacles"
+      :user-name="username"
+    />
 
     <p>
       <gl-sprintf :message="s__('AdminUsers|To confirm, type %{username}')">
         <template #username>
-          <code>{{ username }}</code>
+          <code class="gl-white-space-pre-wrap">{{ username }}</code>
         </template>
       </gl-sprintf>
     </p>

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

@@ -9,6 +9,7 @@ import {
 } from '@gitlab/ui';
 import { convertArrayToCamelCase } from '~/lib/utils/common_utils';
 import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
+import { parseUserDeletionObstacles } from '~/vue_shared/components/user_deletion_obstacles/utils';
 import { I18N_USER_ACTIONS } from '../constants';
 import { generateUserPaths } from '../utils';
 import Actions from './actions';
@@ -72,6 +73,9 @@ export default {
         href: this.userPaths.edit,
       };
     },
+    obstaclesForUserDeletion() {
+      return parseUserDeletionObstacles(this.user);
+    },
   },
   methods: {
     isLdapAction(action) {
@@ -141,7 +145,7 @@ export default {
             :key="action"
             :paths="userPaths"
             :username="user.name"
-            :oncall-schedules="user.oncallSchedules"
+            :user-deletion-obstacles="obstaclesForUserDeletion"
             :data-testid="`delete-${action}`"
           >
             {{ $options.i18n[action] }}

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

@@ -52,6 +52,8 @@ export default {
     },
 
     setSelectedItem(selectedId) {
+      this.selectedId = selectedId;
+
       const label = this.labels.find(({ id }) => id === selectedId);
       if (!selectedId || !label) {
         this.selectedLabel = null;
@@ -87,8 +89,8 @@ export default {
     <template #items>
       <gl-form-radio-group
         v-if="labels.length > 0"
-        v-model="selectedId"
         class="gl-overflow-y-auto gl-px-5 gl-pt-3"
+        :checked="selectedId"
         @change="setSelectedItem"
       >
         <label

app/assets/javascripts/content_editor/content_editor.stories.js

@@ -2,7 +2,7 @@ import { ContentEditor } from './index';
 
 export default {
   component: ContentEditor,
-  title: 'Components/Content Editor',
+  title: 'content_editor/components/content_editor',
 };
 
 const Template = (_, { argTypes }) => ({

app/assets/javascripts/content_editor/extensions/table_of_contents.js

-import { Node, nodeInputRule } from '@tiptap/core';
+import { Node } from '@tiptap/core';
+import { InputRule } from 'prosemirror-inputrules';
 import { s__ } from '~/locale';
 import { PARSE_HTML_PRIORITY_HIGHEST } from '../constants';
 
@@ -32,6 +33,19 @@ export default Node.create({
   },
 
   addInputRules() {
-    return inputRuleRegExps.map((regex) => nodeInputRule(regex, this.type));
+    const { type } = this;
+
+    return inputRuleRegExps.map(
+      (regex) =>
+        new InputRule(regex, (state, match, start, end) => {
+          const { tr } = state;
+
+          if (match) {
+            tr.replaceWith(start - 1, end, type.create());
+          }
+
+          return tr;
+        }),
+    );
   },
 });

app/assets/javascripts/diffs/components/diff_row.vue

 <script>
+/* eslint-disable vue/no-v-html */
+/**
+NOTE: This file uses v-html over v-safe-html for performance reasons, see:
+https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57842
+* */
 import { memoize } from 'lodash';
 import { isLoggedIn } from '~/lib/utils/common_utils';
 import {
@@ -267,7 +272,9 @@ export default {
           ]"
           class="diff-td line_content with-coverage left-side"
           data-testid="left-content"
-          v-html="$options.lineContent(props.line.left) /* eslint-disable-line vue/no-v-html */"
+          v-html="
+            $options.lineContent(props.line.left) /* v-html for performance, see top of file */
+          "
         ></div>
       </template>
       <template
@@ -389,7 +396,9 @@ export default {
             },
           ]"
           class="diff-td line_content with-coverage right-side parallel"
-          v-html="$options.lineContent(props.line.right) /* eslint-disable-line vue/no-v-html */"
+          v-html="
+            $options.lineContent(props.line.right) /* v-html for performance, see top of file */
+          "
         ></div>
       </template>
       <template v-else>

app/assets/javascripts/integrations/integration_settings_form.js

-import $ from 'jquery';
 import { delay } from 'lodash';
 import { __, s__ } from '~/locale';
 import toast from '~/vue_shared/plugins/global_toast';
@@ -8,13 +7,13 @@ import eventHub from './edit/event_hub';
 
 export default class IntegrationSettingsForm {
   constructor(formSelector) {
-    this.$form = $(formSelector);
+    this.$form = document.querySelector(formSelector);
     this.formActive = false;
 
     this.vue = null;
 
     // Form Metadata
-    this.testEndPoint = this.$form.data('testUrl');
+    this.testEndPoint = this.$form.dataset.testUrl;
   }
 
   init() {
@@ -34,8 +33,7 @@ export default class IntegrationSettingsForm {
       this.saveIntegration();
     });
     eventHub.$on('getJiraIssueTypes', () => {
-      // eslint-disable-next-line no-jquery/no-serialize
-      this.getJiraIssueTypes(this.$form.serialize());
+      this.getJiraIssueTypes(new FormData(this.$form));
     });
 
     eventHub.$emit('formInitialized');
@@ -47,11 +45,11 @@ export default class IntegrationSettingsForm {
     // 2) If this service can be saved
     // If both conditions are true, we override form submission
     // and save the service using provided configuration.
-    const formValid = this.$form.get(0).checkValidity() || this.formActive === false;
+    const formValid = this.$form.checkValidity() || this.formActive === false;
 
     if (formValid) {
       delay(() => {
-        this.$form.trigger('submit');
+        this.$form.submit();
       }, 100);
     } else {
       eventHub.$emit('validateForm');
@@ -65,9 +63,8 @@ export default class IntegrationSettingsForm {
     // 2) If this service can be tested
     // If both conditions are true, we override form submission
     // and test the service using provided configuration.
-    if (this.$form.get(0).checkValidity()) {
-      // eslint-disable-next-line no-jquery/no-serialize
-      this.testSettings(this.$form.serialize());
+    if (this.$form.checkValidity()) {
+      this.testSettings(new FormData(this.$form));
     } else {
       eventHub.$emit('validateForm');
       this.vue.$store.dispatch('setIsTesting', false);
@@ -79,9 +76,9 @@ export default class IntegrationSettingsForm {
    */
   toggleServiceState() {
     if (this.formActive) {
-      this.$form.removeAttr('novalidate');
-    } else if (!this.$form.attr('novalidate')) {
-      this.$form.attr('novalidate', 'novalidate');
+      this.$form.removeAttribute('novalidate');
+    } else if (!this.$form.getAttribute('novalidate')) {
+      this.$form.setAttribute('novalidate', 'novalidate');
     }
   }
 

app/assets/javascripts/invite_members/components/invite_members_modal.vue

@@ -11,9 +11,10 @@ import {
   GlFormInput,
   GlFormCheckboxGroup,
 } from '@gitlab/ui';
-import { partition, isString } from 'lodash';
+import { partition, isString, unescape } from 'lodash';
 import Api from '~/api';
 import ExperimentTracking from '~/experimentation/experiment_tracking';
+import { sanitize } from '~/lib/dompurify';
 import { BV_SHOW_MODAL } from '~/lib/utils/constants';
 import { s__, sprintf } from '~/locale';
 import {
@@ -293,7 +294,7 @@ export default {
       };
     },
     conditionallyShowToastSuccess(response) {
-      const message = responseMessageFromSuccess(response);
+      const message = this.unescapeMsg(responseMessageFromSuccess(response));
 
       if (message === '') {
         this.showToastMessageSuccess();
@@ -309,13 +310,17 @@ export default {
       this.closeModal();
     },
     showInvalidFeedbackMessage(response) {
+      const message = this.unescapeMsg(responseMessageFromError(response));
+
       this.isLoading = false;
-      this.invalidFeedbackMessage =
-        responseMessageFromError(response) || this.$options.labels.invalidFeedbackMessageDefault;
+      this.invalidFeedbackMessage = message || this.$options.labels.invalidFeedbackMessageDefault;
     },
     handleMembersTokenSelectClear() {
       this.invalidFeedbackMessage = '';
     },
+    unescapeMsg(message) {
+      return unescape(sanitize(message, { ALLOWED_TAGS: [] }));
+    },
   },
   labels: {
     members: {

app/assets/javascripts/invite_members/utils/response_message_parser.js

@@ -18,7 +18,10 @@ function responseMessageStringForMultiple(message) {
   return message.includes(':');
 }
 function responseMessageStringFirstPart(message) {
-  return message.split(' and ')[0];
+  const firstPart = message.split(':')[1];
+  const firstMsg = firstPart.split(/ and [\w-]*$/)[0].trim();
+
+  return firstMsg;
 }
 
 export function responseMessageFromError(response) {

app/assets/javascripts/members/components/action_buttons/remove_member_button.vue

@@ -42,7 +42,7 @@ export default {
       required: false,
       default: false,
     },
-    oncallSchedules: {
+    userDeletionObstacles: {
       type: Object,
       required: false,
       default: () => ({}),
@@ -61,7 +61,7 @@ export default {
         memberPath: this.memberPath.replace(':id', this.memberId),
         memberType: this.memberType,
         message: this.message,
-        oncallSchedules: this.oncallSchedules,
+        userDeletionObstacles: this.userDeletionObstacles,
       };
     },
   },

app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue

 <script>
 import { s__, sprintf } from '~/locale';
+import { parseUserDeletionObstacles } from '~/vue_shared/components/user_deletion_obstacles/utils';
 import ActionButtonGroup from './action_button_group.vue';
 import LeaveButton from './leave_button.vue';
 import RemoveMemberButton from './remove_member_button.vue';
@@ -49,9 +50,11 @@ export default {
         },
       );
     },
-    oncallScheduleUserData() {
-      const { user: { name, oncallSchedules: schedules } = {} } = this.member;
-      return { name, schedules };
+    userDeletionObstaclesUserData() {
+      return {
+        name: this.member.user?.name,
+        obstacles: parseUserDeletionObstacles(this.member.user),
+      };
     },
   },
 };
@@ -65,7 +68,7 @@ export default {
         v-else
         :member-id="member.id"
         :member-type="member.type"
-        :oncall-schedules="oncallScheduleUserData"
+        :user-deletion-obstacles="userDeletionObstaclesUserData"
         :message="message"
         :title="s__('Member|Remove member')"
       />

app/assets/javascripts/members/components/modals/leave_modal.vue

@@ -3,7 +3,8 @@ import { GlModal, GlForm, GlSprintf, GlTooltipDirective } from '@gitlab/ui';
 import { mapState } from 'vuex';
 import csrf from '~/lib/utils/csrf';
 import { __, s__, sprintf } from '~/locale';
-import OncallSchedulesList from '~/vue_shared/components/oncall_schedules_list.vue';
+import UserDeletionObstaclesList from '~/vue_shared/components/user_deletion_obstacles/user_deletion_obstacles_list.vue';
+import { parseUserDeletionObstacles } from '~/vue_shared/components/user_deletion_obstacles/utils';
 import { LEAVE_MODAL_ID } from '../../constants';
 
 export default {
@@ -20,7 +21,7 @@ export default {
   csrf,
   modalId: LEAVE_MODAL_ID,
   modalContent: s__('Members|Are you sure you want to leave "%{source}"?'),
-  components: { GlModal, GlForm, GlSprintf, OncallSchedulesList },
+  components: { GlModal, GlForm, GlSprintf, UserDeletionObstaclesList },
   directives: {
     GlTooltip: GlTooltipDirective,
   },
@@ -43,11 +44,11 @@ export default {
     modalTitle() {
       return sprintf(s__('Members|Leave "%{source}"'), { source: this.member.source.fullName });
     },
-    schedules() {
-      return this.member.user?.oncallSchedules;
+    obstacles() {
+      return parseUserDeletionObstacles(this.member.user);
     },
-    isPartOfOnCallSchedules() {
-      return this.schedules?.length;
+    hasObstaclesToUserDeletion() {
+      return this.obstacles?.length;
     },
   },
   methods: {
@@ -74,9 +75,9 @@ export default {
         </gl-sprintf>
       </p>
 
-      <oncall-schedules-list
-        v-if="isPartOfOnCallSchedules"
-        :schedules="schedules"
+      <user-deletion-obstacles-list
+        v-if="hasObstaclesToUserDeletion"
+        :obstacles="obstacles"
         :is-current-user="true"
       />
 

app/assets/javascripts/members/components/modals/remove_member_modal.vue

@@ -3,7 +3,7 @@ import { GlFormCheckbox, GlModal } from '@gitlab/ui';
 import { mapActions, mapState } from 'vuex';
 import csrf from '~/lib/utils/csrf';
 import { s__, __ } from '~/locale';
-import OncallSchedulesList from '~/vue_shared/components/oncall_schedules_list.vue';
+import UserDeletionObstaclesList from '~/vue_shared/components/user_deletion_obstacles/user_deletion_obstacles_list.vue';
 
 export default {
   actionCancel: {
@@ -13,7 +13,7 @@ export default {
   components: {
     GlFormCheckbox,
     GlModal,
-    OncallSchedulesList,
+    UserDeletionObstaclesList,
   },
   inject: ['namespace'],
   computed: {
@@ -33,8 +33,8 @@ export default {
       message(state) {
         return state[this.namespace].removeMemberModalData.message;
       },
-      oncallSchedules(state) {
-        return state[this.namespace].removeMemberModalData.oncallSchedules ?? {};
+      userDeletionObstacles(state) {
+        return state[this.namespace].removeMemberModalData.userDeletionObstacles ?? {};
       },
       removeMemberModalVisible(state) {
         return state[this.namespace].removeMemberModalVisible;
@@ -60,11 +60,11 @@ export default {
         },
       };
     },
-    showUnassignIssuablesCheckbox() {
+    hasWorkspaceAccess() {
       return !this.isAccessRequest && !this.isInvite;
     },
-    isPartOfOncallSchedules() {
-      return !this.isAccessRequest && this.oncallSchedules.schedules?.length;
+    hasObstaclesToUserDeletion() {
+      return this.hasWorkspaceAccess && this.userDeletionObstacles.obstacles?.length;
     },
   },
   methods: {
@@ -95,10 +95,10 @@ export default {
     <form ref="form" :action="memberPath" method="post">
       <p>{{ message }}</p>
 
-      <oncall-schedules-list
-        v-if="isPartOfOncallSchedules"
-        :schedules="oncallSchedules.schedules"
-        :user-name="oncallSchedules.name"
+      <user-deletion-obstacles-list
+        v-if="hasObstaclesToUserDeletion"
+        :obstacles="userDeletionObstacles.obstacles"
+        :user-name="userDeletionObstacles.name"
       />
 
       <input ref="method" type="hidden" name="_method" value="delete" />
@@ -106,7 +106,7 @@ export default {
       <gl-form-checkbox v-if="isGroupMember" name="remove_sub_memberships">
         {{ __('Also remove direct user membership from subgroups and projects') }}
       </gl-form-checkbox>
-      <gl-form-checkbox v-if="showUnassignIssuablesCheckbox" name="unassign_issuables">
+      <gl-form-checkbox v-if="hasWorkspaceAccess" name="unassign_issuables">
         {{ __('Also unassign this user from related issues and merge requests') }}
       </gl-form-checkbox>
     </form>

app/assets/javascripts/members/components/table/expires_at.vue

-<script>
-import { GlSprintf, GlTooltipDirective } from '@gitlab/ui';
-import {
-  approximateDuration,
-  differenceInSeconds,
-  formatDate,
-  getDayDifference,
-} from '~/lib/utils/datetime_utility';
-import { DAYS_TO_EXPIRE_SOON } from '../../constants';
-
-export default {
-  name: 'ExpiresAt',
-  components: { GlSprintf },
-  directives: {
-    GlTooltip: GlTooltipDirective,
-  },
-  props: {
-    date: {
-      type: String,
-      required: false,
-      default: null,
-    },
-  },
-  computed: {
-    noExpirationSet() {
-      return this.date === null;
-    },
-    parsed() {
-      return new Date(this.date);
-    },
-    differenceInSeconds() {
-      return differenceInSeconds(new Date(), this.parsed);
-    },
-    isExpired() {
-      return this.differenceInSeconds <= 0;
-    },
-    inWords() {
-      return approximateDuration(this.differenceInSeconds);
-    },
-    formatted() {
-      return formatDate(this.parsed);
-    },
-    expiresSoon() {
-      return getDayDifference(new Date(), this.parsed) < DAYS_TO_EXPIRE_SOON;
-    },
-    cssClass() {
-      return {
-        'gl-text-red-500': this.isExpired,
-        'gl-text-orange-500': this.expiresSoon,
-      };
-    },
-  },
-};
-</script>
-
-<template>
-  <span v-if="noExpirationSet">{{ s__('Members|No expiration set') }}</span>
-  <span v-else v-gl-tooltip.hover :title="formatted" :class="cssClass">
-    <template v-if="isExpired">{{ s__('Members|Expired') }}</template>
-    <gl-sprintf v-else :message="s__('Members|in %{time}')">
-      <template #time>
-        {{ inWords }}
-      </template>
-    </gl-sprintf>
-  </span>
-</template>