Add latest changes from gitlab-org/gitlab@master

17 files changed, 347 insertions, 13 deletions

diff --git a/app/assets/javascripts/graphql_shared/constants.js b/app/assets/javascripts/graphql_shared/constants.js
index 5ba46697496..2863f52bea9 100644
--- a/app/assets/javascripts/graphql_shared/constants.js
+++ b/app/assets/javascripts/graphql_shared/constants.js
@@ -27,5 +27,6 @@ export const TYPENAME_USER = 'User';
 export const TYPENAME_VULNERABILITIES_SCANNER = 'Vulnerabilities::Scanner';
 export const TYPENAME_VULNERABILITY = 'Vulnerability';
 export const TYPENAME_WORK_ITEM = 'WorkItem';
+export const TYPENAME_ORGANIZATION = 'Organization';
 export const TYPE_USERS_SAVED_REPLY = 'Users::SavedReply';
 export const TYPE_WORKSPACE = 'RemoteDevelopment::Workspace';
diff --git a/app/assets/javascripts/invite_members/components/invite_members_modal.vue b/app/assets/javascripts/invite_members/components/invite_members_modal.vue
index 505612c59da..1a10130e969 100644
--- a/app/assets/javascripts/invite_members/components/invite_members_modal.vue
+++ b/app/assets/javascripts/invite_members/components/invite_members_modal.vue
@@ -7,7 +7,11 @@ import Api from '~/api';
 import Tracking from '~/tracking';
 import { BV_SHOW_MODAL, BV_HIDE_MODAL } from '~/lib/utils/constants';
 import { n__, s__, sprintf } from '~/locale';
-import { memberName, triggerExternalAlert } from 'ee_else_ce/invite_members/utils/member_utils';
+import {
+  memberName,
+  triggerExternalAlert,
+  inviteMembersTrackingOptions,
+} from 'ee_else_ce/invite_members/utils/member_utils';
 import { captureException } from '~/ci/runner/sentry_utils';
 import {
   USERS_FILTER_ALL,
@@ -135,6 +139,9 @@ export default {
     isCelebration() {
       return this.mode === 'celebrate';
     },
+    baseTrackingDetails() {
+      return { label: this.source, celebrate: this.isCelebration };
+    },
     isTextForAdmin() {
       return this.isCurrentUserAdmin && Boolean(this.newUsersUrl);
     },
@@ -252,7 +259,7 @@ export default {
       this.source = source;
 
       this.$root.$emit(BV_SHOW_MODAL, this.modalId);
-      this.track('render', { label: this.source });
+      this.track('render', inviteMembersTrackingOptions(this.baseTrackingDetails));
     },
     closeModal() {
       this.$root.$emit(BV_HIDE_MODAL, this.modalId);
@@ -321,10 +328,10 @@ export default {
       return this.newUsersToInvite.find((member) => memberName(member) === username)?.name;
     },
     onCancel() {
-      this.track('click_cancel', { label: this.source });
+      this.track('click_cancel', inviteMembersTrackingOptions(this.baseTrackingDetails));
     },
     onClose() {
-      this.track('click_x', { label: this.source });
+      this.track('click_x', inviteMembersTrackingOptions(this.baseTrackingDetails));
     },
     resetFields() {
       this.clearValidation();
@@ -333,7 +340,7 @@ export default {
       this.newUsersToInvite = [];
     },
     onInviteSuccess() {
-      this.track('invite_successful', { label: this.source });
+      this.track('invite_successful', inviteMembersTrackingOptions(this.baseTrackingDetails));
 
       if (this.reloadPageOnSubmit) {
         reloadOnInvitationSuccess();
diff --git a/app/assets/javascripts/invite_members/utils/member_utils.js b/app/assets/javascripts/invite_members/utils/member_utils.js
index 7998cb69445..52fb5e98f27 100644
--- a/app/assets/javascripts/invite_members/utils/member_utils.js
+++ b/app/assets/javascripts/invite_members/utils/member_utils.js
@@ -6,3 +6,7 @@ export function memberName(member) {
 export function triggerExternalAlert() {
   return false;
 }
+
+export function inviteMembersTrackingOptions(options) {
+  return { label: options.label };
+}
diff --git a/app/assets/javascripts/organizations/profile/preferences/index.js b/app/assets/javascripts/organizations/profile/preferences/index.js
new file mode 100644
index 00000000000..0b0dd313cd8
--- /dev/null
+++ b/app/assets/javascripts/organizations/profile/preferences/index.js
@@ -0,0 +1,41 @@
+import Vue from 'vue';
+import VueApollo from 'vue-apollo';
+import createDefaultClient from '~/lib/graphql';
+import { s__ } from '~/locale';
+import OrganizationSelect from '~/vue_shared/components/entity_select/organization_select.vue';
+import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
+import resolvers from '../../shared/graphql/resolvers';
+
+export const initHomeOrganizationSetting = () => {
+  const el = document.getElementById('js-home-organization-setting');
+
+  if (!el) return false;
+
+  const {
+    dataset: { appData },
+  } = el;
+  const { initialSelection } = convertObjectPropsToCamelCase(JSON.parse(appData));
+
+  const apolloProvider = new VueApollo({
+    defaultClient: createDefaultClient(resolvers),
+  });
+
+  return new Vue({
+    el,
+    name: 'HomeOrganizationSetting',
+    apolloProvider,
+    render(createElement) {
+      return createElement(OrganizationSelect, {
+        props: {
+          block: true,
+          label: s__('Organization|Home organization'),
+          description: s__('Organization|Choose what organization you want to see by default.'),
+          inputName: 'home_organization',
+          inputId: 'home_organization',
+          initialSelection,
+          toggleClass: 'gl-form-input-xl',
+        },
+      });
+    },
+  });
+};
diff --git a/app/assets/javascripts/organizations/shared/graphql/queries/organization.query.graphql b/app/assets/javascripts/organizations/shared/graphql/queries/organization.query.graphql
new file mode 100644
index 00000000000..1d95786fcb0
--- /dev/null
+++ b/app/assets/javascripts/organizations/shared/graphql/queries/organization.query.graphql
@@ -0,0 +1,9 @@
+query getOrganization($id: ID!) {
+  organization(id: $id) @client {
+    id
+    name
+    descriptionHtml
+    avatarUrl
+    webUrl
+  }
+}
diff --git a/app/assets/javascripts/pages/profiles/preferences/show/index.js b/app/assets/javascripts/pages/profiles/preferences/show/index.js
index 76939434680..3668811bec7 100644
--- a/app/assets/javascripts/pages/profiles/preferences/show/index.js
+++ b/app/assets/javascripts/pages/profiles/preferences/show/index.js
@@ -1,5 +1,7 @@
 import initProfilePreferences from '~/profile/preferences/profile_preferences_bundle';
 import initProfilePreferencesDiffsColors from '~/profile/preferences/profile_preferences_diffs_colors';
+import { initHomeOrganizationSetting } from '~/organizations/profile/preferences';
 
 initProfilePreferences();
 initProfilePreferencesDiffsColors();
+initHomeOrganizationSetting();
diff --git a/app/assets/javascripts/vue_shared/components/entity_select/constants.js b/app/assets/javascripts/vue_shared/components/entity_select/constants.js
index 0fb5a2d5534..5bad907c9f9 100644
--- a/app/assets/javascripts/vue_shared/components/entity_select/constants.js
+++ b/app/assets/javascripts/vue_shared/components/entity_select/constants.js
@@ -14,3 +14,13 @@ export const PROJECT_TOGGLE_TEXT = s__('ProjectSelect|Search for project');
 export const PROJECT_HEADER_TEXT = s__('ProjectSelect|Select a project');
 export const FETCH_PROJECTS_ERROR = __('Unable to fetch projects. Reload the page to try again.');
 export const FETCH_PROJECT_ERROR = __('Unable to fetch project. Reload the page to try again.');
+
+// Organizations
+export const ORGANIZATION_TOGGLE_TEXT = s__('Organization|Search for an organization');
+export const ORGANIZATION_HEADER_TEXT = s__('Organization|Select an organization');
+export const FETCH_ORGANIZATIONS_ERROR = s__(
+  'Organization|Unable to fetch organizations. Reload the page to try again.',
+);
+export const FETCH_ORGANIZATION_ERROR = s__(
+  'Organization|Unable to fetch organizations. Reload the page to try again.',
+);
diff --git a/app/assets/javascripts/vue_shared/components/entity_select/entity_select.vue b/app/assets/javascripts/vue_shared/components/entity_select/entity_select.vue
index 970c24c6e87..1a215454ab6 100644
--- a/app/assets/javascripts/vue_shared/components/entity_select/entity_select.vue
+++ b/app/assets/javascripts/vue_shared/components/entity_select/entity_select.vue
@@ -22,6 +22,11 @@ export default {
       type: String,
       required: true,
     },
+    description: {
+      type: String,
+      required: false,
+      default: '',
+    },
     inputName: {
       type: String,
       required: true,
@@ -31,7 +36,7 @@ export default {
       required: true,
     },
     initialSelection: {
-      type: String,
+      type: [String, Number],
       required: false,
       default: null,
     },
@@ -57,6 +62,11 @@ export default {
       required: false,
       default: null,
     },
+    toggleClass: {
+      type: [String, Array, Object],
+      required: false,
+      default: '',
+    },
   },
   data() {
     return {
@@ -152,6 +162,7 @@ export default {
 
       this.searching = true;
       const name = await this.fetchInitialSelectionText(this.initialSelection);
+
       this.selectedValue = this.initialSelection;
       this.selectedText = name;
       this.pristine = false;
@@ -178,7 +189,7 @@ export default {
 </script>
 
 <template>
-  <gl-form-group :label="label">
+  <gl-form-group :label="label" :description="description">
     <slot name="error"></slot>
     <template v-if="Boolean($scopedSlots.label)" #label>
       <slot name="label"></slot>
@@ -196,6 +207,7 @@ export default {
       :no-results-text="noResultsText"
       :infinite-scroll="hasMoreItems"
       :infinite-scroll-loading="infiniteScrollLoading"
+      :toggle-class="toggleClass"
       searchable
       @shown="onShown"
       @search="search"
diff --git a/app/assets/javascripts/vue_shared/components/entity_select/organization_select.vue b/app/assets/javascripts/vue_shared/components/entity_select/organization_select.vue
new file mode 100644
index 00000000000..d068d86d95b
--- /dev/null
+++ b/app/assets/javascripts/vue_shared/components/entity_select/organization_select.vue
@@ -0,0 +1,150 @@
+<script>
+import { GlAlert } from '@gitlab/ui';
+import * as Sentry from '~/sentry/sentry_browser_wrapper';
+import getCurrentUserOrganizationsQuery from '~/organizations/index/graphql/organizations.query.graphql';
+import getOrganizationQuery from '~/organizations/shared/graphql/queries/organization.query.graphql';
+import { getIdFromGraphQLId, convertToGraphQLId } from '~/graphql_shared/utils';
+import { TYPENAME_ORGANIZATION } from '~/graphql_shared/constants';
+import {
+  ORGANIZATION_TOGGLE_TEXT,
+  ORGANIZATION_HEADER_TEXT,
+  FETCH_ORGANIZATIONS_ERROR,
+  FETCH_ORGANIZATION_ERROR,
+} from './constants';
+import EntitySelect from './entity_select.vue';
+
+export default {
+  name: 'OrganizationSelect',
+  components: {
+    GlAlert,
+    EntitySelect,
+  },
+  props: {
+    block: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    label: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    description: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    inputName: {
+      type: String,
+      required: true,
+    },
+    inputId: {
+      type: String,
+      required: true,
+    },
+    initialSelection: {
+      type: [String, Number],
+      required: false,
+      default: null,
+    },
+    clearable: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    toggleClass: {
+      type: [String, Array, Object],
+      required: false,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      errorMessage: '',
+    };
+  },
+  methods: {
+    async fetchOrganizations() {
+      try {
+        const {
+          data: {
+            currentUser: {
+              organizations: { nodes },
+            },
+          },
+        } = await this.$apollo.query({
+          query: getCurrentUserOrganizationsQuery,
+          // TODO: implement search support - https://gitlab.com/gitlab-org/gitlab/-/issues/429999.
+        });
+
+        return {
+          items: nodes.map((organization) => ({
+            text: organization.name,
+            value: getIdFromGraphQLId(organization.id),
+          })),
+          // TODO: implement pagination - https://gitlab.com/gitlab-org/gitlab/-/issues/429999.
+          totalPages: 1,
+        };
+      } catch (error) {
+        this.handleError({ message: FETCH_ORGANIZATIONS_ERROR, error });
+
+        return { items: [], totalPages: 0 };
+      }
+    },
+    async fetchOrganizationName(id) {
+      try {
+        const {
+          data: {
+            organization: { name },
+          },
+        } = await this.$apollo.query({
+          query: getOrganizationQuery,
+          variables: { id: convertToGraphQLId(TYPENAME_ORGANIZATION, id) },
+        });
+
+        return name;
+      } catch (error) {
+        this.handleError({ message: FETCH_ORGANIZATION_ERROR, error });
+
+        return '';
+      }
+    },
+    handleError({ message, error }) {
+      Sentry.captureException(error);
+      this.errorMessage = message;
+    },
+    dismissError() {
+      this.errorMessage = '';
+    },
+  },
+  i18n: {
+    toggleText: ORGANIZATION_TOGGLE_TEXT,
+    selectGroup: ORGANIZATION_HEADER_TEXT,
+  },
+};
+</script>
+
+<template>
+  <entity-select
+    :block="block"
+    :label="label"
+    :description="description"
+    :input-name="inputName"
+    :input-id="inputId"
+    :initial-selection="initialSelection"
+    :clearable="clearable"
+    :header-text="$options.i18n.selectGroup"
+    :default-toggle-text="$options.i18n.toggleText"
+    :fetch-items="fetchOrganizations"
+    :fetch-initial-selection-text="fetchOrganizationName"
+    :toggle-class="toggleClass"
+    v-on="$listeners"
+  >
+    <template #error>
+      <gl-alert v-if="errorMessage" class="gl-mb-3" variant="danger" @dismiss="dismissError">{{
+        errorMessage
+      }}</gl-alert>
+    </template>
+  </entity-select>
+</template>
diff --git a/app/helpers/organizations/organization_helper.rb b/app/helpers/organizations/organization_helper.rb
index 312f55c11d2..61eb9b5c35f 100644
--- a/app/helpers/organizations/organization_helper.rb
+++ b/app/helpers/organizations/organization_helper.rb
@@ -48,6 +48,13 @@ module Organizations
       }
     end
 
+    def home_organization_setting_app_data
+      {
+        # TODO: use real setting - https://gitlab.com/gitlab-org/gitlab/-/issues/428668
+        initial_selection: 1
+      }.to_json
+    end
+
     private
 
     def shared_groups_and_projects_app_data
diff --git a/app/services/spam/spam_action_service.rb b/app/services/spam/spam_action_service.rb
index 6ec8d09c37c..cca0bb709aa 100644
--- a/app/services/spam/spam_action_service.rb
+++ b/app/services/spam/spam_action_service.rb
@@ -78,14 +78,17 @@ module Spam
         when BLOCK_USER
           target.spam!
           create_spam_log
+          create_spam_abuse_event(result)
           ban_user!
         when DISALLOW
           target.spam!
           create_spam_log
+          create_spam_abuse_event(result)
         when CONDITIONAL_ALLOW
           # This means "require a CAPTCHA to be solved"
           target.needs_recaptcha!
           create_spam_log
+          create_spam_abuse_event(result)
         when OVERRIDE_VIA_ALLOW_POSSIBLE_SPAM
           create_spam_log
         when ALLOW
@@ -118,6 +121,22 @@ module Spam
       target.spam_log = spam_log
     end
 
+    def create_spam_abuse_event(result)
+      params = {
+        user_id: user.id,
+        title: target.spam_title,
+        description: target.spam_description,
+        source_ip: spam_params&.ip_address,
+        user_agent: spam_params&.user_agent,
+        noteable_type: noteable_type,
+        verdict: result
+      }
+
+      target.run_after_commit_or_now do
+        Abuse::SpamAbuseEventsWorker.perform_async(params)
+      end
+    end
+
     def ban_user!
       UserCustomAttribute.set_banned_by_spam_log(target.spam_log)
 
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index a6534a16e86..4b0e030db24 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -78,6 +78,9 @@
       = f.gitlab_ui_radio_component :layout, layout_choices[0][1], layout_choices[0][0], help_text: fixed_help_text
       = f.gitlab_ui_radio_component :layout, layout_choices[1][1], layout_choices[1][0], help_text: fluid_help_text
 
+    - if Feature.enabled?(:ui_for_organizations, current_user)
+      #js-home-organization-setting{ data: { app_data: home_organization_setting_app_data } }
+
     .js-listbox-input{ data: { label: s_('Preferences|Homepage'), description: s_('Preferences|Choose what content you want to see by default on your homepage.'), name: 'user[dashboard]', items: dashboard_choices.to_json, value: current_user.dashboard, block: true.to_s, toggle_class: 'gl-form-input-xl' } }
 
     = render_if_exists 'profiles/preferences/group_overview_selector', f: f # EE-specific
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index 21004b7eb8a..e8b78298eb4 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -10,10 +10,10 @@
       %div
         %h1.home-panel-title.gl-font-size-h1.gl-mt-3.gl-mb-2.gl-display-flex.gl-word-break-word{ data: { testid: 'project-name-content' }, itemprop: 'name' }
           = @project.name
-          = visibility_level_content(@project, css_class: 'visibility-icon gl-text-secondary gl-ml-2', icon_css_class: 'icon')
-          = render_if_exists 'compliance_management/compliance_framework/compliance_framework_badge', project: @project, additional_classes: 'gl-align-self-center gl-ml-2'
+          = visibility_level_content(@project, css_class: 'visibility-icon gl-text-secondary gl-mx-2', icon_css_class: 'icon')
+          = render_if_exists 'compliance_management/compliance_framework/compliance_framework_badge', project: @project, additional_classes: 'gl-align-self-center gl-mx-2'
           - if @project.catalog_resource
-            = render partial: 'shared/ci_catalog_badge', locals: { href: project_ci_catalog_resource_path(@project, @project.catalog_resource) }
+            = render partial: 'shared/ci_catalog_badge', locals: { href: project_ci_catalog_resource_path(@project, @project.catalog_resource), css_class: 'gl-mx-2' }
           - if @project.group
             = render_if_exists 'shared/tier_badge', source: @project, source_type: 'Project'
         .home-panel-metadata.gl-font-sm.gl-text-secondary.gl-font-base.gl-font-weight-normal.gl-line-height-normal{ data: { testid: 'project-id-content' }, itemprop: 'identifier' }
diff --git a/app/views/shared/_ci_catalog_badge.html.haml b/app/views/shared/_ci_catalog_badge.html.haml
index 345bfb5e022..7f8f4f6143b 100644
--- a/app/views/shared/_ci_catalog_badge.html.haml
+++ b/app/views/shared/_ci_catalog_badge.html.haml
@@ -1 +1 @@
-= render Pajamas::BadgeComponent.new(s_('CiCatalog|CI/CD catalog resource'), variant: 'info', icon: 'catalog-checkmark', class: 'gl-mx-2', href: href)
+= render Pajamas::BadgeComponent.new(s_('CiCatalog|CI/CD catalog resource'), variant: 'info', icon: 'catalog-checkmark', class: css_class, href: href)
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml
index fc9522e3f32..e65dcd68f66 100644
--- a/app/views/shared/projects/_project.html.haml
+++ b/app/views/shared/projects/_project.html.haml
@@ -35,10 +35,10 @@
             %span.project-name<
               = project.name
 
-        = visibility_level_content(project, css_class: 'gl-mr-3')
+        = visibility_level_content(project, css_class: 'gl-mr-2')
 
         - if project.catalog_resource
-          = render partial: 'shared/ci_catalog_badge', locals: { href: project_ci_catalog_resource_path(project, project.catalog_resource) }
+          = render partial: 'shared/ci_catalog_badge', locals: { href: project_ci_catalog_resource_path(project, project.catalog_resource), css_class: 'gl-mr-2' }
 
         - if explore_projects_tab? && project_license_name(project)
           %span.gl-display-inline-flex.gl-align-items-center.gl-mr-3
diff --git a/app/workers/abuse/spam_abuse_events_worker.rb b/app/workers/abuse/spam_abuse_events_worker.rb
new file mode 100644
index 00000000000..7d86e994ae4
--- /dev/null
+++ b/app/workers/abuse/spam_abuse_events_worker.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Abuse
+  class SpamAbuseEventsWorker
+    include ApplicationWorker
+
+    data_consistency :delayed
+
+    idempotent!
+    feature_category :instance_resiliency
+    urgency :low
+
+    def perform(params)
+      params = params.with_indifferent_access
+
+      @user = User.find_by_id(params[:user_id])
+      unless @user
+        logger.info(structured_payload(message: "User not found.", user_id: params[:user_id]))
+        return
+      end
+
+      report_user(params)
+    end
+
+    private
+
+    attr_reader :user
+
+    def report_user(params)
+      category = 'spam'
+      reporter = Users::Internal.security_bot
+      report_params = { user_id: params[:user_id],
+                        reporter: reporter,
+                        category: category,
+                        message: 'User reported for abuse based on spam verdict' }
+
+      abuse_report = AbuseReport.by_category(category).by_reporter_id(reporter.id).by_user_id(params[:user_id]).first
+
+      abuse_report = AbuseReport.create!(report_params) if abuse_report.nil?
+
+      create_abuse_event(abuse_report.id, params)
+    end
+
+    # Associate the abuse report with an abuse event
+    def create_abuse_event(abuse_report_id, params)
+      Abuse::Event.create!(
+        abuse_report_id: abuse_report_id,
+        category: :spam,
+        metadata: { noteable_type: params[:noteable_type],
+                    title: params[:title],
+                    description: params[:description],
+                    source_ip: params[:source_ip],
+                    user_agent: params[:user_agent],
+                    verdict: params[:verdict] },
+        source: :spamcheck,
+        user: user
+      )
+    end
+  end
+end
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index 96514f64c26..716cd494810 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -2280,6 +2280,15 @@
   :weight: 1
   :idempotent: true
   :tags: []
+- :name: abuse_spam_abuse_events
+  :worker_name: Abuse::SpamAbuseEventsWorker
+  :feature_category: :instance_resiliency
+  :has_external_dependencies: false
+  :urgency: :low
+  :resource_boundary: :unknown
+  :weight: 1
+  :idempotent: true
+  :tags: []
 - :name: analytics_usage_trends_counter_job
   :worker_name: Analytics::UsageTrends::CounterJobWorker
   :feature_category: :devops_reports