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/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/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/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>

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

@@ -10,7 +10,6 @@ import RemoveGroupLinkModal from '../modals/remove_group_link_modal.vue';
 import RemoveMemberModal from '../modals/remove_member_modal.vue';
 import CreatedAt from './created_at.vue';
 import ExpirationDatepicker from './expiration_datepicker.vue';
-import ExpiresAt from './expires_at.vue';
 import MemberActionButtons from './member_action_buttons.vue';
 import MemberAvatar from './member_avatar.vue';
 import MemberSource from './member_source.vue';
@@ -24,7 +23,6 @@ export default {
     GlPagination,
     MemberAvatar,
     CreatedAt,
-    ExpiresAt,
     MembersTableCell,
     MemberSource,
     MemberActionButtons,
@@ -182,10 +180,6 @@ export default {
         <created-at :date="createdAt" />
       </template>
 
-      <template #cell(expires)="{ item: { expiresAt } }">
-        <expires-at :date="expiresAt" />
-      </template>
-
       <template #cell(maxRole)="{ item: member }">
         <members-table-cell #default="{ permissions }" :member="member">
           <role-dropdown v-if="permissions.canUpdate" :permissions="permissions" :member="member" />

app/assets/javascripts/members/constants.js

@@ -37,12 +37,6 @@ export const FIELDS = [
     thClass: 'col-meta',
     tdClass: 'col-meta',
   },
-  {
-    key: 'expires',
-    label: __('Access expires'),
-    thClass: 'col-meta',
-    tdClass: 'col-meta',
-  },
   {
     key: 'maxRole',
     label: __('Max role'),

app/assets/javascripts/pages/groups/group_members/index.js

@@ -11,7 +11,7 @@ import { MEMBER_TYPES } from '~/members/constants';
 import { groupLinkRequestFormatter } from '~/members/utils';
 import UsersSelect from '~/users_select';
 
-const SHARED_FIELDS = ['account', 'expires', 'maxRole', 'expiration', 'actions'];
+const SHARED_FIELDS = ['account', 'maxRole', 'expiration', 'actions'];
 
 initMembersApp(document.querySelector('.js-group-members-list-app'), {
   [MEMBER_TYPES.user]: {

app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/timezone_dropdown.js

@@ -27,19 +27,22 @@ export const findTimezoneByIdentifier = (tzList = [], identifier = null) => {
 };
 
 export default class TimezoneDropdown {
-  constructor({ $dropdownEl, $inputEl, onSelectTimezone, displayFormat } = defaults) {
+  constructor({
+    $dropdownEl,
+    $inputEl,
+    onSelectTimezone,
+    displayFormat,
+    allowEmpty = false,
+  } = defaults) {
     this.$dropdown = $dropdownEl;
     this.$dropdownToggle = this.$dropdown.find('.dropdown-toggle-text');
     this.$input = $inputEl;
-    this.timezoneData = this.$dropdown.data('data');
+    this.timezoneData = this.$dropdown.data('data') || [];
 
     this.onSelectTimezone = onSelectTimezone;
     this.displayFormat = displayFormat || defaults.displayFormat;
+    this.allowEmpty = allowEmpty;
 
-    this.initialTimezone =
-      findTimezoneByIdentifier(this.timezoneData, this.$input.val()) || defaultTimezone;
-
-    this.initDefaultTimezone();
     this.initDropdown();
   }
 
@@ -52,24 +55,25 @@ export default class TimezoneDropdown {
       search: {
         fields: ['name'],
       },
-      clicked: (cfg) => this.updateInputValue(cfg),
+      clicked: (cfg) => this.handleDropdownChange(cfg),
       text: (item) => formatTimezone(item),
     });
 
-    this.setDropdownToggle(this.displayFormat(this.initialTimezone));
-  }
+    const initialTimezone = findTimezoneByIdentifier(this.timezoneData, this.$input.val());
 
-  initDefaultTimezone() {
-    if (!this.$input.val()) {
-      this.$input.val(defaultTimezone.name);
+    if (initialTimezone !== null) {
+      this.setDropdownValue(initialTimezone);
+    } else if (!this.allowEmpty) {
+      this.setDropdownValue(defaultTimezone);
     }
   }
 
-  setDropdownToggle(dropdownText) {
-    this.$dropdownToggle.text(dropdownText);
+  setDropdownValue(timezone) {
+    this.$dropdownToggle.text(this.displayFormat(timezone));
+    this.$input.val(timezone.name);
   }
 
-  updateInputValue({ selectedObj, e }) {
+  handleDropdownChange({ selectedObj, e }) {
     e.preventDefault();
     this.$input.val(selectedObj.identifier);
     if (this.onSelectTimezone) {

app/assets/javascripts/pages/projects/project_members/index.js

@@ -26,7 +26,7 @@ initInviteMembersForm();
 
 new UsersSelect(); // eslint-disable-line no-new
 
-const SHARED_FIELDS = ['account', 'expires', 'maxRole', 'expiration', 'actions'];
+const SHARED_FIELDS = ['account', 'maxRole', 'expiration', 'actions'];
 initMembersApp(document.querySelector('.js-project-members-list-app'), {
   [MEMBER_TYPES.user]: {
     tableFields: SHARED_FIELDS.concat(['source', 'granted']),

app/assets/javascripts/profile/profile.js

@@ -21,6 +21,7 @@ export default class Profile {
       $inputEl: this.$inputEl,
       $dropdownEl: $('.js-timezone-dropdown'),
       displayFormat: (selectedItem) => formatTimezone(selectedItem),
+      allowEmpty: true,
     });
   }
 

app/assets/javascripts/vue_merge_request_widget/constants.js

@@ -99,6 +99,12 @@ export const EXTENSION_ICONS = {
   neutral: 'neutral',
   error: 'error',
   notice: 'notice',
+  severityCritical: 'severityCritical',
+  severityHigh: 'severityHigh',
+  severityMedium: 'severityMedium',
+  severityLow: 'severityLow',
+  severityInfo: 'severityInfo',
+  severityUnknown: 'severityUnknown',
 };
 
 export const EXTENSION_ICON_NAMES = {
@@ -108,6 +114,12 @@ export const EXTENSION_ICON_NAMES = {
   neutral: 'status-neutral',
   error: 'status-alert',
   notice: 'status-alert',
+  severityCritical: 'severity-critical',
+  severityHigh: 'severity-high',
+  severityMedium: 'severity-medium',
+  severityLow: 'severity-low',
+  severityInfo: 'severity-info',
+  severityUnknown: 'severity-unknown',
 };
 
 export const EXTENSION_ICON_CLASS = {
@@ -117,6 +129,12 @@ export const EXTENSION_ICON_CLASS = {
   neutral: 'gl-text-gray-400',
   error: 'gl-text-red-500',
   notice: 'gl-text-gray-500',
+  severityCritical: 'gl-text-red-800',
+  severityHigh: 'gl-text-red-600',
+  severityMedium: 'gl-text-orange-400',
+  severityLow: 'gl-text-orange-300',
+  severityInfo: 'gl-text-blue-400',
+  severityUnknown: 'gl-text-gray-400',
 };
 
 export { STATE_MACHINE };

app/controllers/import/bulk_imports_controller.rb

@@ -37,7 +37,7 @@ def status
   end
 
   def create
-    response = BulkImportService.new(current_user, create_params, credentials).execute
+    response = ::BulkImports::CreateService.new(current_user, create_params, credentials).execute
 
     if response.success?
       render json: response.payload.to_json(only: [:id])

app/helpers/time_zone_helper.rb

@@ -33,6 +33,8 @@ def timezone_data(format: :short)
   end
 
   def local_time(timezone)
+    return if timezone.blank?
+
     time_zone_instance = ActiveSupport::TimeZone.new(timezone) || Time.zone
     time_zone_instance.now.strftime("%-l:%M %p")
   end

app/models/concerns/restricted_signup.rb

@@ -7,15 +7,49 @@ module RestrictedSignup
   def validate_admin_signup_restrictions(email)
     return if allowed_domain?(email)
 
+    error_type = fetch_error_type(email)
+
+    return unless error_type.present?
+
+    [
+      signup_email_invalid_message,
+      error_message[created_by_key][error_type]
+    ].join(' ')
+  end
+
+  def fetch_error_type(email)
     if allowlist_present?
-      return _('domain is not authorized for sign-up.')
+      :allowlist
     elsif denied_domain?(email)
-      return _('is not from an allowed domain.')
+      :denylist
     elsif restricted_email?(email)
-      return _('is not allowed. Try again with a different email address, or contact your GitLab admin.')
+      :restricted
     end
+  end
+
+  def error_message
+    {
+      admin: {
+        allowlist: html_escape_once(_("Go to the 'Admin area > Sign-up restrictions', and check 'Allowed domains for sign-ups'.")).html_safe,
+        denylist: html_escape_once(_("Go to the 'Admin area > Sign-up restrictions', and check the 'Domain denylist'.")).html_safe,
+        restricted: html_escape_once(_("Go to the 'Admin area > Sign-up restrictions', and check 'Email restrictions for sign-ups'.")).html_safe,
+        group_setting: html_escape_once(_("Go to the group’s 'Settings > General' page, and check 'Restrict membership by email domain'.")).html_safe
+      },
+      nonadmin: {
+        allowlist: error_nonadmin,
+        denylist: error_nonadmin,
+        restricted: error_nonadmin,
+        group_setting: error_nonadmin
+      }
+    }
+  end
+
+  def error_nonadmin
+    _("Check with your administrator.")
+  end
 
-    nil
+  def created_by_key
+    created_by&.can_admin_all_resources? ? :admin : :nonadmin
   end
 
   def denied_domain?(email)

app/models/member.rb

@@ -448,6 +448,14 @@ def signup_email_valid?
     errors.add(:user, error) if error
   end
 
+  def signup_email_invalid_message
+    if source_type == 'Project'
+      _("is not allowed for this project.")
+    else
+      _("is not allowed for this group.")
+    end
+  end
+
   def update_highest_role?
     return unless user_id.present?
 

app/models/user.rb

@@ -2102,6 +2102,10 @@ def signup_email_valid?
     errors.add(:email, error) if error
   end
 
+  def signup_email_invalid_message
+    _('is not allowed for sign-up.')
+  end
+
   def check_username_format
     return if username.blank? || Mime::EXTENSION_LOOKUP.keys.none? { |type| username.end_with?(".#{type}") }
 

app/models/user_preference.rb

@@ -23,7 +23,6 @@ class UserPreference < ApplicationRecord
   ignore_columns :experience_level, remove_with: '14.10', remove_after: '2021-03-22'
 
   default_value_for :tab_width, value: Gitlab::TabWidth::DEFAULT, allows_nil: false
-  default_value_for :timezone, value: Time.zone.tzinfo.name, allows_nil: false
   default_value_for :time_display_relative, value: true, allows_nil: false
   default_value_for :time_format_in_24h, value: false, allows_nil: false
   default_value_for :render_whitespace_in_code, value: false, allows_nil: false

app/services/bulk_import_service.rb → app/services/bulk_imports/create_service.rb

@@ -23,48 +23,50 @@
 # - For each group to be imported (BulkImport::Entity.with_status(:created))
 #   - Import the group data
 #   - Create entities for each subgroup of the imported group
-#   - Enqueue a BulkImportService job (Pn) to import the new entities (subgroups)
+#   - Enqueue a BulkImports::CreateService job (Pn) to import the new entities (subgroups)
 #
-class BulkImportService
-  attr_reader :current_user, :params, :credentials
+module BulkImports
+  class CreateService
+    attr_reader :current_user, :params, :credentials
 
-  def initialize(current_user, params, credentials)
-    @current_user = current_user
-    @params = params
-    @credentials = credentials
-  end
+    def initialize(current_user, params, credentials)
+      @current_user = current_user
+      @params = params
+      @credentials = credentials
+    end
 
-  def execute
-    bulk_import = create_bulk_import
+    def execute
+      bulk_import = create_bulk_import
 
-    BulkImportWorker.perform_async(bulk_import.id)
+      BulkImportWorker.perform_async(bulk_import.id)
 
-    ServiceResponse.success(payload: bulk_import)
-  rescue ActiveRecord::RecordInvalid => e
-    ServiceResponse.error(
-      message: e.message,
-      http_status: :unprocessable_entity
-    )
-  end
+      ServiceResponse.success(payload: bulk_import)
+    rescue ActiveRecord::RecordInvalid => e
+      ServiceResponse.error(
+        message: e.message,
+        http_status: :unprocessable_entity
+      )
+    end
 
-  private
+    private
 
-  def create_bulk_import
-    BulkImport.transaction do
-      bulk_import = BulkImport.create!(user: current_user, source_type: 'gitlab')
-      bulk_import.create_configuration!(credentials.slice(:url, :access_token))
+    def create_bulk_import
+      BulkImport.transaction do
+        bulk_import = BulkImport.create!(user: current_user, source_type: 'gitlab')
+        bulk_import.create_configuration!(credentials.slice(:url, :access_token))
 
-      params.each do |entity|
-        BulkImports::Entity.create!(
-          bulk_import: bulk_import,
-          source_type: entity[:source_type],
-          source_full_path: entity[:source_full_path],
-          destination_name: entity[:destination_name],
-          destination_namespace: entity[:destination_namespace]
-        )
-      end
+        params.each do |entity|
+          BulkImports::Entity.create!(
+            bulk_import: bulk_import,
+            source_type: entity[:source_type],
+            source_full_path: entity[:source_full_path],
+            destination_name: entity[:destination_name],
+            destination_namespace: entity[:destination_namespace]
+          )
+        end
 
-      bulk_import
+        bulk_import
+      end
     end
   end
 end