Merge branch 'sy-destroy-integrations-api' into 'master'

Add GraphQL support for removing alert integrations

See merge request gitlab-org/gitlab!45843

GITALY_SERVER_VERSION

-1c4fdefdaf88730c025b5c7ba7ddc42c268043d4
+940a45ca938b20031820a4976f936a5b6173de92

app/assets/javascripts/analytics/product_analytics/components/activity_chart.vue

@@ -17,10 +17,13 @@ export default {
     },
   },
   computed: {
-    seriesData() {
-      return {
-        full: this.formattedData.keys.map((val, idx) => [val, this.formattedData.values[idx]]),
-      };
+    barSeriesData() {
+      return [
+        {
+          name: 'full',
+          data: this.formattedData.keys.map((val, idx) => [val, this.formattedData.values[idx]]),
+        },
+      ];
     },
   },
 };
@@ -30,7 +33,7 @@ export default {
   <div class="gl-xs-w-full">
     <gl-column-chart
       v-if="formattedData.keys"
-      :data="seriesData"
+      :bars="barSeriesData"
       :x-axis-title="__('Value')"
       :y-axis-title="__('Number of events')"
       :x-axis-type="'category'"

app/assets/javascripts/monitoring/components/charts/column.vue

@@ -35,18 +35,14 @@ export default {
     };
   },
   computed: {
-    chartData() {
-      const queryData = this.graphData.metrics.reduce((acc, query) => {
+    barChartData() {
+      return this.graphData.metrics.reduce((acc, query) => {
         const series = makeDataSeries(query.result || [], {
           name: this.formatLegendLabel(query),
         });
 
         return acc.concat(series);
       }, []);
-
-      return {
-        values: queryData[0].data,
-      };
     },
     chartOptions() {
       const xAxis = getTimeAxisOptions({ timezone: this.timezone });
@@ -109,7 +105,7 @@ export default {
     <gl-column-chart
       ref="columnChart"
       v-bind="$attrs"
-      :data="chartData"
+      :bars="barChartData"
       :option="chartOptions"
       :width="width"
       :height="height"

app/assets/javascripts/monitoring/components/charts/stacked_column.vue

@@ -61,14 +61,16 @@ export default {
   },
   computed: {
     chartData() {
-      return this.graphData.metrics.map(({ result }) => {
-        // This needs a fix. Not only metrics[0] should be shown.
-        // See https://gitlab.com/gitlab-org/gitlab/-/issues/220492
-        if (!result || result.length === 0) {
-          return [];
-        }
-        return result[0].values.map(val => val[1]);
-      });
+      return this.graphData.metrics
+        .map(({ label: name, result }) => {
+          // This needs a fix. Not only metrics[0] should be shown.
+          // See https://gitlab.com/gitlab-org/gitlab/-/issues/220492
+          if (!result || result.length === 0) {
+            return [];
+          }
+          return { name, data: result[0].values.map(val => val[1]) };
+        })
+        .slice(0, 1);
     },
     xAxisTitle() {
       return this.graphData.x_label !== undefined ? this.graphData.x_label : '';
@@ -136,7 +138,7 @@ export default {
     <gl-stacked-column-chart
       ref="chart"
       v-bind="$attrs"
-      :data="chartData"
+      :bars="chartData"
       :option="chartOptions"
       :x-axis-title="xAxisTitle"
       :y-axis-title="yAxisTitle"
@@ -144,7 +146,6 @@ export default {
       :group-by="groupBy"
       :width="width"
       :height="height"
-      :series-names="seriesNames"
       :legend-layout="legendLayout"
       :legend-average-text="legendAverageText"
       :legend-current-text="legendCurrentText"

app/assets/javascripts/pages/projects/graphs/charts/index.js

@@ -5,6 +5,8 @@ import { __ } from '~/locale';
 import CodeCoverage from '../components/code_coverage.vue';
 import SeriesDataMixin from './series_data_mixin';
 
+const seriesDataToBarData = raw => Object.entries(raw).map(([name, data]) => ({ name, data }));
+
 document.addEventListener('DOMContentLoaded', () => {
   waitForCSSLoaded(() => {
     const languagesContainer = document.getElementById('js-languages-chart');
@@ -41,13 +43,13 @@ document.addEventListener('DOMContentLoaded', () => {
       },
       computed: {
         seriesData() {
-          return { full: this.chartData.map(d => [d.label, d.value]) };
+          return [{ name: 'full', data: this.chartData.map(d => [d.label, d.value]) }];
         },
       },
       render(h) {
         return h(GlColumnChart, {
           props: {
-            data: this.seriesData,
+            bars: this.seriesData,
             xAxisTitle: __('Used programming language'),
             yAxisTitle: __('Percentage'),
             xAxisType: 'category',
@@ -86,7 +88,7 @@ document.addEventListener('DOMContentLoaded', () => {
       render(h) {
         return h(GlColumnChart, {
           props: {
-            data: this.seriesData,
+            bars: seriesDataToBarData(this.seriesData),
             xAxisTitle: __('Day of month'),
             yAxisTitle: __('No. of commits'),
             xAxisType: 'category',
@@ -113,13 +115,13 @@ document.addEventListener('DOMContentLoaded', () => {
             acc.push([key, weekDays[key]]);
             return acc;
           }, []);
-          return { full: data };
+          return [{ name: 'full', data }];
         },
       },
       render(h) {
         return h(GlColumnChart, {
           props: {
-            data: this.seriesData,
+            bars: this.seriesData,
             xAxisTitle: __('Weekday'),
             yAxisTitle: __('No. of commits'),
             xAxisType: 'category',
@@ -143,7 +145,7 @@ document.addEventListener('DOMContentLoaded', () => {
       render(h) {
         return h(GlColumnChart, {
           props: {
-            data: this.seriesData,
+            bars: seriesDataToBarData(this.seriesData),
             xAxisTitle: __('Hour (UTC)'),
             yAxisTitle: __('No. of commits'),
             xAxisType: 'category',

app/assets/javascripts/projects/pipelines/charts/components/app.vue

@@ -45,9 +45,12 @@ export default {
   },
   data() {
     return {
-      timesChartTransformedData: {
-        full: this.mergeLabelsAndValues(this.timesChartData.labels, this.timesChartData.values),
-      },
+      timesChartTransformedData: [
+        {
+          name: 'full',
+          data: this.mergeLabelsAndValues(this.timesChartData.labels, this.timesChartData.values),
+        },
+      ],
     };
   },
   computed: {
@@ -128,7 +131,7 @@ export default {
         <gl-column-chart
           :height="$options.chartContainerHeight"
           :option="$options.timesChartOptions"
-          :data="timesChartTransformedData"
+          :bars="timesChartTransformedData"
           :y-axis-title="__('Minutes')"
           :x-axis-title="__('Commit')"
           x-axis-type="category"

app/assets/javascripts/vue_shared/components/members/constants.js

@@ -51,6 +51,7 @@ export const FIELDS = [
     key: 'actions',
     thClass: 'col-actions',
     tdClass: 'col-actions',
+    showFunction: 'showActionsField',
   },
 ];
 

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

@@ -2,6 +2,12 @@
 import { mapState } from 'vuex';
 import { GlTable, GlBadge } from '@gitlab/ui';
 import MembersTableCell from 'ee_else_ce/vue_shared/components/members/table/members_table_cell.vue';
+import {
+  canOverride,
+  canRemove,
+  canResend,
+  canUpdate,
+} from 'ee_else_ce/vue_shared/components/members/utils';
 import { FIELDS } from '../constants';
 import initUserPopovers from '~/user_popovers';
 import MemberAvatar from './member_avatar.vue';
@@ -33,14 +39,40 @@ export default {
       ),
   },
   computed: {
-    ...mapState(['members', 'tableFields']),
+    ...mapState(['members', 'tableFields', 'currentUserId', 'sourceId']),
     filteredFields() {
-      return FIELDS.filter(field => this.tableFields.includes(field.key));
+      return FIELDS.filter(field => this.tableFields.includes(field.key) && this.showField(field));
+    },
+    userIsLoggedIn() {
+      return this.currentUserId !== null;
     },
   },
   mounted() {
     initUserPopovers(this.$el.querySelectorAll('.js-user-link'));
   },
+  methods: {
+    showField(field) {
+      if (!Object.prototype.hasOwnProperty.call(field, 'showFunction')) {
+        return true;
+      }
+
+      return this[field.showFunction]();
+    },
+    showActionsField() {
+      if (!this.userIsLoggedIn) {
+        return false;
+      }
+
+      return this.members.some(member => {
+        return (
+          canRemove(member, this.sourceId) ||
+          canResend(member) ||
+          canUpdate(member, this.currentUserId, this.sourceId) ||
+          canOverride(member)
+        );
+      });
+    },
+  },
 };
 </script>
 

app/assets/javascripts/vue_shared/components/members/table/members_table_cell.vue

 <script>
 import { mapState } from 'vuex';
 import { MEMBER_TYPES } from '../constants';
+import { isGroup, isDirectMember, isCurrentUser, canRemove, canResend, canUpdate } from '../utils';
 
 export default {
   name: 'MembersTableCell',
@@ -13,7 +14,7 @@ export default {
   computed: {
     ...mapState(['sourceId', 'currentUserId']),
     isGroup() {
-      return Boolean(this.member.sharedWithGroup);
+      return isGroup(this.member);
     },
     isInvite() {
       return Boolean(this.member.invite);
@@ -33,19 +34,19 @@ export default {
       return MEMBER_TYPES.user;
     },
     isDirectMember() {
-      return this.isGroup || this.member.source?.id === this.sourceId;
+      return isDirectMember(this.member, this.sourceId);
     },
     isCurrentUser() {
-      return this.member.user?.id === this.currentUserId;
+      return isCurrentUser(this.member, this.currentUserId);
     },
     canRemove() {
-      return this.isDirectMember && this.member.canRemove;
+      return canRemove(this.member, this.sourceId);
     },
     canResend() {
-      return Boolean(this.member.invite?.canResend);
+      return canResend(this.member);
     },
     canUpdate() {
-      return !this.isCurrentUser && this.isDirectMember && this.member.canUpdate;
+      return canUpdate(this.member, this.currentUserId, this.sourceId);
     },
   },
   render() {

app/assets/javascripts/vue_shared/components/members/utils.js

@@ -17,3 +17,32 @@ export const generateBadges = (member, isCurrentUser) => [
     variant: 'info',
   },
 ];
+
+export const isGroup = member => {
+  return Boolean(member.sharedWithGroup);
+};
+
+export const isDirectMember = (member, sourceId) => {
+  return isGroup(member) || member.source?.id === sourceId;
+};
+
+export const isCurrentUser = (member, currentUserId) => {
+  return member.user?.id === currentUserId;
+};
+
+export const canRemove = (member, sourceId) => {
+  return isDirectMember(member, sourceId) && member.canRemove;
+};
+
+export const canResend = member => {
+  return Boolean(member.invite?.canResend);
+};
+
+export const canUpdate = (member, currentUserId, sourceId) => {
+  return (
+    !isCurrentUser(member, currentUserId) && isDirectMember(member, sourceId) && member.canUpdate
+  );
+};
+
+// Defined in `ee/app/assets/javascripts/vue_shared/components/members/utils.js`
+export const canOverride = () => false;

app/controllers/projects/merge_requests_controller.rb

@@ -40,7 +40,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
     push_frontend_feature_flag(:highlight_current_diff_row, @project)
     push_frontend_feature_flag(:default_merge_ref_for_diffs, @project)
     push_frontend_feature_flag(:core_security_mr_widget, @project, default_enabled: true)
-    push_frontend_feature_flag(:remove_resolve_note, @project)
+    push_frontend_feature_flag(:remove_resolve_note, @project, default_enabled: true)
 
     record_experiment_user(:invite_members_version_a)
     record_experiment_user(:invite_members_version_b)
@@ -318,7 +318,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
   end
 
   def export_csv
-    return render_404 unless Feature.enabled?(:export_merge_requests_as_csv, project)
+    return render_404 unless Feature.enabled?(:export_merge_requests_as_csv, project, default_enabled: true)
 
     IssuableExportCsvWorker.perform_async(:merge_request, current_user.id, project.id, finder_options.to_h) # rubocop:disable CodeReuse/Worker
 

app/controllers/projects/settings/repository_controller.rb

@@ -18,14 +18,13 @@ module Projects
       end
 
       def cleanup
-        cleanup_params = params.require(:project).permit(:bfg_object_map)
-        result = Projects::UpdateService.new(project, current_user, cleanup_params).execute
+        bfg_object_map = params.require(:project).require(:bfg_object_map)
+        result = Projects::CleanupService.enqueue(project, current_user, bfg_object_map)
 
         if result[:status] == :success
-          RepositoryCleanupWorker.perform_async(project.id, current_user.id) # rubocop:disable CodeReuse/Worker
           flash[:notice] = _('Repository cleanup has started. You will receive an email once the cleanup operation is complete.')
         else
-          flash[:alert] = _('Failed to upload object map file')
+          flash[:alert] = status.fetch(:message, _('Failed to upload object map file'))
         end
 
         redirect_to project_settings_repository_path(project)

app/graphql/types/merge_request_type.rb

@@ -118,8 +118,7 @@ module Types
           resolver: Resolvers::MergeRequestPipelinesResolver
 
     field :milestone, Types::MilestoneType, null: true,
-          description: 'The milestone of the merge request',
-          resolve: -> (obj, _args, _ctx) { Gitlab::Graphql::Loaders::BatchModelLoader.new(Milestone, obj.milestone_id).find }
+          description: 'The milestone of the merge request'
     field :assignees, Types::UserType.connection_type, null: true, complexity: 5,
           description: 'Assignees of the merge request'
     field :author, Types::UserType, null: true,

app/mailers/emails/projects.rb

@@ -56,12 +56,9 @@ module Emails
            subject:   @message.subject)
     end
 
-    def prometheus_alert_fired_email(project_id, user_id, alert_attributes)
-      @project = ::Project.find(project_id)
-      user = ::User.find(user_id)
-
-      @alert = AlertManagement::Alert.new(alert_attributes.with_indifferent_access).present
-      return unless @alert.parsed_payload.has_required_attributes?
+    def prometheus_alert_fired_email(project, user, alert)
+      @project = project
+      @alert = alert.present
 
       subject_text = "Alert: #{@alert.email_title}"
       mail(to: user.notification_email_for(@project.group), subject: subject(subject_text))

app/services/alert_management/process_prometheus_alert_service.rb

@@ -9,6 +9,10 @@ module AlertManagement
       return bad_request unless incoming_payload.has_required_attributes?
 
       process_alert_management_alert
+      return bad_request unless alert.persisted?
+
+      process_incident_issues if process_issues?
+      send_alert_email if send_email?
 
       ServiceResponse.success
     end
@@ -30,8 +34,6 @@ module AlertManagement
       else
         create_alert_management_alert
       end
-
-      process_incident_issues if process_issues?
     end
 
     def reset_alert_management_alert_status
@@ -85,12 +87,17 @@ module AlertManagement
     end
 
     def process_incident_issues
-      return unless alert.persisted?
-      return if alert.issue
+      return if alert.issue || alert.resolved?
 
       IncidentManagement::ProcessAlertWorker.perform_async(nil, nil, alert.id)
     end
 
+    def send_alert_email
+      notification_service
+        .async
+        .prometheus_alerts_fired(project, [alert])
+    end
+
     def logger
       @logger ||= Gitlab::AppLogger
     end

app/services/notification_service.rb

@@ -601,7 +601,7 @@ class NotificationService
     return if project.emails_disabled?
 
     owners_and_maintainers_without_invites(project).to_a.product(alerts).each do |recipient, alert|
-      mailer.prometheus_alert_fired_email(project.id, recipient.user.id, alert).deliver_later
+      mailer.prometheus_alert_fired_email(project, recipient.user, alert).deliver_later
     end
   end
 

app/services/projects/alerting/notify_service.rb

@@ -73,7 +73,7 @@ module Projects
       end
 
       def process_incident_issues
-        return if alert.issue
+        return if alert.issue || alert.resolved?
 
         ::IncidentManagement::ProcessAlertWorker.perform_async(nil, nil, alert.id)
       end
@@ -81,7 +81,7 @@ module Projects
       def send_alert_email
         notification_service
           .async
-          .prometheus_alerts_fired(project, [alert.attributes])
+          .prometheus_alerts_fired(project, [alert])
       end
 
       def alert

app/services/projects/cleanup_service.rb

@@ -11,6 +11,24 @@ module Projects
 
     include Gitlab::Utils::StrongMemoize
 
+    class << self
+      def enqueue(project, current_user, bfg_object_map)
+        Projects::UpdateService.new(project, current_user, bfg_object_map: bfg_object_map).execute.tap do |result|
+          next unless result[:status] == :success
+
+          project.set_repository_read_only!
+          RepositoryCleanupWorker.perform_async(project.id, current_user.id)
+        end
+      rescue Project::RepositoryReadOnlyError => err
+        { status: :error, message: (_('Failed to make repository read-only. %{reason}') % { reason: err.message }) }
+      end
+
+      def cleanup_after(project)
+        project.bfg_object_map.remove!
+        project.set_repository_writable!
+      end
+    end
+
     # Attempt to clean up the project following the push. Warning: this is
     # destructive!
     #
@@ -29,7 +47,7 @@ module Projects
       # time. Better to feel the pain immediately.
       project.repository.expire_all_method_caches
 
-      project.bfg_object_map.remove!
+      self.class.cleanup_after(project)
     end
 
     private

app/services/projects/prometheus/alerts/notify_service.rb

@@ -23,7 +23,6 @@ module Projects
           return unauthorized unless valid_alert_manager_token?(token)
 
           process_prometheus_alerts
-          send_alert_email if send_email?
 
           ServiceResponse.success
         end
@@ -120,14 +119,6 @@ module Projects
           ActiveSupport::SecurityUtils.secure_compare(expected, actual)
         end
 
-        def send_alert_email
-          return unless firings.any?
-
-          notification_service
-            .async
-            .prometheus_alerts_fired(project, alerts_attributes)
-        end
-
         def process_prometheus_alerts
           alerts.each do |alert|
             AlertManagement::ProcessPrometheusAlertService
@@ -136,18 +127,6 @@ module Projects
           end
         end
 
-        def alerts_attributes
-          firings.map do |payload|
-            alert_params = Gitlab::AlertManagement::Payload.parse(
-              project,
-              payload,
-              monitoring_tool: Gitlab::AlertManagement::Payload::MONITORING_TOOLS[:prometheus]
-            ).alert_params
-
-            AlertManagement::Alert.new(alert_params).attributes
-          end
-        end
-
         def bad_request
           ServiceResponse.error(message: 'Bad Request', http_status: :bad_request)
         end

app/views/admin/application_settings/_signin.html.haml

@@ -50,11 +50,11 @@
       = f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'home_help_block'
       %span.form-text.text-muted#home_help_block We will redirect non-logged in users to this page
     .form-group
-      = f.label :after_sign_out_path, class: 'label-bold'
+      = f.label :after_sign_out_path, _('After sign-out path'), class: 'label-bold'
       = f.text_field :after_sign_out_path, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'after_sign_out_path_help_block'
       %span.form-text.text-muted#after_sign_out_path_help_block We will redirect users to this page after they sign out
     .form-group
-      = f.label :sign_in_text, class: 'label-bold'
+      = f.label :sign_in_text, _('Sign-in text'), class: 'label-bold'
       = f.text_area :sign_in_text, class: 'form-control', rows: 4
       .form-text.text-muted Markdown enabled
   = f.submit 'Save changes', class: "gl-button btn btn-success"

app/views/notify/prometheus_alert_fired_email.html.haml

+- body = @alert.resolved? ? _('An alert has been resolved in %{project_path}.') : _('An alert has been triggered in %{project_path}.')
+
+%p
+  = body % { project_path: @alert.project.full_path }
 %p
-  = _('An alert has been triggered in %{project_path}.') % { project_path: @alert.project.full_path }
+  = link_to(_('View alert details.'), @alert.details_url)
 
 - if description = @alert.description
   %p

app/views/notify/prometheus_alert_fired_email.text.erb

-<%= _('An alert has been triggered in %{project_path}.') % { project_path: @alert.project.full_path } %>.
+<% body = @alert.resolved? ? _('An alert has been resolved in %{project_path}.') : _('An alert has been triggered in %{project_path}.') %>
+
+<%= body % { project_path: @alert.project.full_path } %>
+<%= _('View alert details at') %> <%= @alert.details_url %>
 
 <% if description = @alert.description %>
 <%= _('Description:') %> <%= description %>

app/views/projects/merge_requests/_nav_btns.html.haml

-- if Feature.enabled?(:export_merge_requests_as_csv, @project)
+- if Feature.enabled?(:export_merge_requests_as_csv, @project, default_enabled: true)
   .btn-group
     = render 'shared/issuable/csv_export/button', issuable_type: 'merge-requests'
 
@@ -8,5 +8,5 @@
   = link_to new_merge_request_path, class: "gl-button btn btn-success", title: "New merge request" do
     New merge request
 
-  - if Feature.enabled?(:export_merge_requests_as_csv, @project)
+  - if Feature.enabled?(:export_merge_requests_as_csv, @project, default_enabled: true)
     = render 'shared/issuable/csv_export/modal', issuable_type: 'merge_requests'

app/workers/repository_cleanup_worker.rb

@@ -27,8 +27,9 @@ class RepositoryCleanupWorker # rubocop:disable Scalability/IdempotentWorker
     project = Project.find(project_id)
     user = User.find(user_id)
 
-    # Ensure the file is removed
-    project.bfg_object_map.remove!
+    # Ensure the file is removed and the repository is made read-write again
+    Projects::CleanupService.cleanup_after(project)
+
     notification_service.repository_cleanup_failure(project, user, error)
   end
 

changelogs/unreleased/220104-read-only-repository-cleanup.yml

+---
+title: Make the repository read-only while running cleanup
+merge_request: 45058
+author:
+type: changed

changelogs/unreleased/273623-replace-sign-in-text-with-sign-in-text.yml

+---
+title: Corrected grammar in Sign-in restrictions text
+merge_request: 46500
+author:
+type: other

changelogs/unreleased/ff-export_merge_requests_as_csv-default-on.yml

+---
+title: Enable MR CSV export
+merge_request: 46662
+author:
+type: added

changelogs/unreleased/fix-api-boards-docs.yml

+---
+title: Fix example responses for Project Issue Board creation API in the docs
+merge_request: 46749
+author: Takuya Noguchi
+type: fixed

changelogs/unreleased/ph-removeResolveNoteDefaultEnabled.yml

+---
+title: Remove the ability to resole individual notes
+merge_request: 46775
+author:
+type: removed

changelogs/unreleased/sy-swap-alert-email-api.yml

+---
+title: Improve messaging for emails from alerts
+merge_request: 43054
+author:
+type: changed

config/feature_flags/development/export_merge_requests_as_csv.yml

@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45130
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267129
 type: development
 group: group::compliance
-default_enabled: false
+default_enabled: true

config/feature_flags/development/remove_resolve_note.yml

@@ -4,4 +4,4 @@ introduced_by_url:
 rollout_issue_url:
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true

config/initializers/0_inject_feature_flags.rb

@@ -16,7 +16,6 @@ if Gitlab.ee? && Gitlab.dev_or_test_env?
   IGNORED_FEATURE_FLAGS = %i[
     ci_secrets_management
     feature_flags_related_issues
-    group_coverage_reports
     group_wikis
     incident_sla
     swimlanes

doc/api/boards.md

@@ -203,48 +203,12 @@ Example response:
       "web_url": "http://example.com/diaspora/diaspora-project-site"
     },
     "name": "newboard",
-    "milestone":   {
-      "id": 12
-      "title": "10.0"
-    },
-    "lists" : [
-      {
-        "id" : 1,
-        "label" : {
-          "name" : "Testing",
-          "color" : "#F0AD4E",
-          "description" : null
-        },
-        "position" : 1,
-        "max_issue_count": 0,
-        "max_issue_weight": 0,
-        "limit_metric":  null
-      },
-      {
-        "id" : 2,
-        "label" : {
-          "name" : "Ready",
-          "color" : "#FF0000",
-          "description" : null
-        },
-        "position" : 2,
-        "max_issue_count": 0,
-        "max_issue_weight": 0,
-        "limit_metric":  null
-      },
-      {
-        "id" : 3,
-        "label" : {
-          "name" : "Production",
-          "color" : "#FF5F00",
-          "description" : null
-        },
-        "position" : 3,
-        "max_issue_count": 0,
-        "max_issue_weight": 0,
-        "limit_metric":  null
-      }
-    ]
+    "lists" : [],
+    "group": null,
+    "milestone": null,
+    "assignee" : null,
+    "labels" : [],
+    "weight" : null
   }
 ```
 

doc/development/experiment_guide/index.md

@@ -142,7 +142,7 @@ context 'when the experiment is active and the user is in the experimental group
     expect_snowplow_event(
       category: 'Growth::Activation::Experiment::SignUpFlow',
       action: 'action',
-      label: 'value',
+      value: 'value',
       label: 'experimentation_subject_id',
       property: 'experimental_group'
     )
@@ -254,7 +254,7 @@ For visibility, please also share any commands run against production in the `#s
 
 #### RSpec
 
-Use the folowing in RSpec to mock the experiment:
+Use the following in RSpec to mock the experiment:
 
 ```ruby
 context 'when the experiment is active' do

doc/user/profile/account/two_factor_authentication.md

@@ -21,20 +21,20 @@ TIP: **Tip:**
 When you enable 2FA, don't forget to back up your [recovery codes](#recovery-codes)!
 
 In addition to time-based one time passwords (TOTP), GitLab supports U2F
-(universal 2nd factor) devices as the second factor of authentication. Once
+(universal 2nd factor) and WebAuthn (experimental) devices as the second factor of authentication. Once
 enabled, in addition to supplying your username and password to log in, you'll
-be prompted to activate your U2F device (usually by pressing a button on it),
+be prompted to activate your U2F / WebAuthn device (usually by pressing a button on it),
 and it will perform secure authentication on your behalf.
 
 It is highly recommended that you set up 2FA with both a
 [one-time password authenticator](#one-time-password) or use [FortiAuthenticator](#one-time-password-via-fortiauthenticator)
-and a [U2F device](#u2f-device), so you can still access your account if you
-lose your U2F device.
+and a [U2F device](#u2f-device) or a [WebAuthn device](#webauthn-device), so you can still access your account
+if you lose your U2F / WebAuthn device.
 
 ## Enabling 2FA
 
-There are two ways to enable two-factor authentication: via a one time password authenticator
-or a U2F device.
+There are multiple ways to enable two-factor authentication: via a one time password authenticator
+or a U2F / WebAuthn device.
 
 ### One-time password
 
@@ -174,10 +174,46 @@ To set up 2FA with a U2F device:
 You will see a message indicating that your device was successfully set up.
 Click on **Register U2F Device** to complete the process.
 
+### WebAuthn device
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/22506) in GitLab 13.4.
+> - It's [deployed behind a feature flag](../../feature_flags.md), disabled by default.
+> - It's disabled on GitLab.com.
+> - It's not recommended for production use.
+> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-webauthn). **(CORE ONLY)**
+
+The WebAuthn workflow is [supported by](https://caniuse.com/#search=webauthn) the
+following desktop browsers:
+
+- Chrome
+- Edge
+- Firefox
+- Opera
+- Safari
+
+and the following mobile browsers:
+
+- Chrome for Android
+- Firefox for Android
+- iOS Safari (since iOS 13.3)
+
+To set up 2FA with a WebAuthn compatible device:
+
+1. Sign in to your GitLab account.
+1. Go to your [**Profile settings**](../index.md#profile-settings).
+1. Go to **Account**.
+1. Select **Enable Two-Factor Authentication**.
+1. Plug in your WebAuthn device.
+1. Select **Set up New WebAuthn Device**.
+1. Depending on your device, you might need to press a button or touch a sensor.
+
+You will see a message indicating that your device was successfully set up.
+Recovery codes are not generated for WebAuthn devices.
+
 ## Recovery codes
 
 NOTE: **Note:**
-Recovery codes are not generated for U2F devices.
+Recovery codes are not generated for U2F / WebAuthn devices.
 
 CAUTION: **Caution:**
 Each code can be used only once to log in to your account.
@@ -215,6 +251,14 @@ To log in via a U2F device:
 You will see a message indicating that your device responded to the authentication
 request and you will be automatically logged in.
 
+### Log in via WebAuthn device
+
+In supported browsers you should be automatically prompted to activate your WebAuthn device
+(e.g. by touching/pressing its button) after entering your credentials.
+
+You will see a message indicating that your device responded to the authentication
+request and you will be automatically logged in.
+
 ## Disabling 2FA
 
 If you ever need to disable 2FA:
@@ -225,7 +269,7 @@ If you ever need to disable 2FA:
 1. Click **Disable**, under **Two-Factor Authentication**.
 
 This will clear all your two-factor authentication registrations, including mobile
-applications and U2F devices.
+applications and U2F / WebAuthn devices.
 
 ## Personal access tokens
 
@@ -331,7 +375,8 @@ Sign in and re-enable two-factor authentication as soon as possible.
   you may have cases where authorization always fails because of time differences.
 - The GitLab U2F implementation does _not_ work when the GitLab instance is accessed from
   multiple hostnames, or FQDNs. Each U2F registration is linked to the _current hostname_ at
-  the time of registration, and cannot be used for other hostnames/FQDNs.
+  the time of registration, and cannot be used for other hostnames/FQDNs. The same applies to 
+  WebAuthn registrations.
 
   For example, if a user is trying to access a GitLab instance from `first.host.xyz` and `second.host.xyz`:
 
@@ -342,6 +387,25 @@ Sign in and re-enable two-factor authentication as soon as possible.
 
 - To enforce 2FA at the system or group levels see [Enforce Two-factor Authentication](../../../security/two_factor_authentication.md).
 
+## Enable or disable WebAuthn **(CORE ONLY)**
+
+Support for WebAuthn is under development and not ready for production use. It is
+deployed behind a feature flag that is **disabled by default**.
+[GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md)
+can enable it.
+
+To enable it:
+
+```ruby
+Feature.enable(:webauthn)
+```
+
+To disable it:
+
+```ruby
+Feature.disable(:webauthn)
+```
+
 ## Troubleshooting
 
 If you are receiving an `invalid pin code` error, this may indicate that there is a time sync issue between the authentication application and the GitLab instance itself.

doc/user/project/merge_requests/csv_export.md

@@ -7,10 +7,12 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 # Export Merge Requests to CSV **(CORE)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/3619) in GitLab 13.6.
-> - It's [deployed behind a feature flag](../../../administration/feature_flags.md), disabled by default.
-> - It's disabled on GitLab.com.
-> - It's not recommended for production use.
-> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-export-merge-requests-to-csv). **(CORE ONLY)**
+> - It was [deployed behind a feature flag](../../../administration/feature_flags.md), disabled by default.
+> - Became enabled by default in GitLab 13.6.
+> - It's enabled on GitLab.com.
+> - It's recommended for production use.
+> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-export-merge-requests-to-csv). **(CORE ONLY)**
+> - It can be enabled or disabled for a single project.
 
 CAUTION: **Warning:**
 This feature might not be available to you. Check the **version history** note above for details.
@@ -55,25 +57,25 @@ The following table shows what attributes will be present in the CSV.
 
 ### Enable or disable Export Merge Requests to CSV **(CORE ONLY)**
 
-Export merge requests to CSV is under development and not ready for production use. It is
-deployed behind a feature flag that is **disabled by default**.
+Export merge requests to CSV is under development but ready for production use.
+It is deployed behind a feature flag that is **enabled by default**.
 [GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md)
-can enable it.
+can opt to disable it.
 
 To enable it:
 
 ```ruby
+# For the instance
 Feature.enable(:export_merge_requests_as_csv)
+# For a single project
+Feature.enable(:export_merge_requests_as_csv, Project.find(<project id>))
 ```
 
 To disable it:
 
 ```ruby
-Feature.enable(:export_merge_requests_as_csv)
-```
-
-Optionally, pass a project as an argument to enable for a single project.
-
-```ruby
-Feature.enable(:export_merge_requests_as_csv, project)
+# For the instance
+Feature.disable(:export_merge_requests_as_csv)
+# For a single project
+Feature.disable(:export_merge_requests_as_csv, Project.find(<project id>))
 ```

doc/user/project/repository/reducing_the_repo_size_using_git.md

@@ -202,6 +202,12 @@ To purge files from GitLab storage:
 
 ## Repository cleanup
 
+NOTE: **Note:**
+Safely cleaning the repository requires it to be made read-only for the duration
+of the operation. This happens automatically, but submitting the cleanup request
+will fail if any writes are ongoing, so cancel any outstanding `git push`
+operations before continuing.
+
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/19376) in GitLab 11.6.
 
 Repository cleanup allows you to upload a text file of objects and GitLab will remove internal Git

ee/app/assets/javascripts/analytics/contribution_analytics/components/column_chart.vue

@@ -65,7 +65,7 @@ export default {
       };
     },
     seriesData() {
-      return { full: this.chartData };
+      return [{ name: 'full', data: this.chartData }];
     },
   },
   methods: {
@@ -102,7 +102,7 @@ export default {
       v-bind="$attrs"
       :width="width"
       :height="height"
-      :data="seriesData"
+      :bars="seriesData"
       :x-axis-title="xAxisTitle"
       :y-axis-title="yAxisTitle"
       x-axis-type="category"

ee/app/assets/javascripts/analytics/cycle_analytics/components/tasks_by_type/tasks_by_type_chart.vue

@@ -15,21 +15,16 @@ export default {
       type: Array,
       required: true,
     },
-    seriesNames: {
-      type: Array,
-      required: true,
-    },
   },
 };
 </script>
 <template>
   <gl-stacked-column-chart
-    :data="data"
+    :bars="data"
     :group-by="groupBy"
     x-axis-type="category"
     y-axis-type="value"
     :x-axis-title="__('Date')"
     :y-axis-title="s__('CycleAnalytics|Number of tasks')"
-    :series-names="seriesNames"
   />
 </template>

ee/app/assets/javascripts/analytics/cycle_analytics/components/type_of_work_charts.vue

@@ -87,7 +87,6 @@ export default {
         v-if="hasData"
         :data="tasksByTypeChartData.data"
         :group-by="tasksByTypeChartData.groupBy"
-        :series-names="tasksByTypeChartData.seriesNames"
       />
       <gl-alert v-else variant="info" :dismissible="false" class="gl-mt-3">
         {{ error }}

ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/getters.js

@@ -21,5 +21,5 @@ export const tasksByTypeChartData = ({ data = [] } = {}, _, rootState = {}) => {
         startDate,
         endDate,
       })
-    : { groupBy: [], data: [], seriesNames: [] };
+    : { groupBy: [], data: [] };
 };

ee/app/assets/javascripts/analytics/cycle_analytics/utils.js

@@ -253,7 +253,6 @@ export const getTasksByTypeData = ({ data = [], startDate = null, endDate = null
     return {
       groupBy: [],
       data: [],
-      seriesNames: [],
     };
   }
 
@@ -269,14 +268,19 @@ export const getTasksByTypeData = ({ data = [], startDate = null, endDate = null
   const transformed = data.reduce(
     (acc, curr) => {
       const {
-        label: { title },
+        label: { title: name },
         series,
       } = curr;
-      acc.seriesNames = [...acc.seriesNames, title];
       acc.data = [
         ...acc.data,
-        // adds 0 values for each data point and overrides with data from the series
-        flattenTaskByTypeSeries({ ...zeroValuesForEachDataPoint, ...Object.fromEntries(series) }),
+        {
+          name,
+          // adds 0 values for each data point and overrides with data from the series
+          data: flattenTaskByTypeSeries({
+            ...zeroValuesForEachDataPoint,
+            ...Object.fromEntries(series),
+          }),
+        },
       ];
       return acc;
     },

ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue

@@ -206,7 +206,7 @@ export default {
         :chart-data="getColumnChartData(chartKeys.main)"
       >
         <gl-column-chart
-          :data="{ full: getColumnChartData(chartKeys.main) }"
+          :bars="[{ name: 'full', data: getColumnChartData(chartKeys.main) }]"
           :option="getColumnChartOption(chartKeys.main)"
           :y-axis-title="__('Merge requests')"
           :x-axis-title="__('Days')"
@@ -257,7 +257,7 @@ export default {
               "
             >
               <gl-column-chart
-                :data="{ full: getColumnChartData(chartKeys.timeBasedHistogram) }"
+                :bars="[{ name: 'full', data: getColumnChartData(chartKeys.timeBasedHistogram) }]"
                 :option="getColumnChartOption(chartKeys.timeBasedHistogram)"
                 :y-axis-title="s__('ProductivityAnalytics|Merge requests')"
                 :x-axis-title="s__('ProductivityAnalytics|Hours')"
@@ -283,7 +283,7 @@ export default {
               "
             >
               <gl-column-chart
-                :data="{ full: getColumnChartData(chartKeys.commitBasedHistogram) }"
+                :bars="[{ name: 'full', data: getColumnChartData(chartKeys.commitBasedHistogram) }]"
                 :option="getColumnChartOption(chartKeys.commitBasedHistogram)"
                 :y-axis-title="s__('ProductivityAanalytics|Merge requests')"
                 :x-axis-title="getMetricLabel(chartKeys.commitBasedHistogram)"

ee/app/assets/javascripts/insights/components/insights_chart.vue

@@ -134,7 +134,7 @@ export default {
       v-if="loaded && isColumnChart"
       v-bind="$attrs"
       :height="$options.height"
-      :data="data.datasets"
+      :bars="data.datasets"
       x-axis-type="category"
       :x-axis-title="data.xAxisTitle"
       :y-axis-title="data.yAxisTitle"
@@ -145,9 +145,8 @@ export default {
       v-else-if="loaded && isStackedColumnChart"
       v-bind="$attrs"
       :height="$options.height"
-      :data="data.datasets"
+      :bars="data.datasets"
       :group-by="data.labels"
-      :series-names="data.seriesNames"
       x-axis-type="category"
       :x-axis-title="data.xAxisTitle"
       :y-axis-title="data.yAxisTitle"

ee/app/assets/javascripts/insights/stores/modules/insights/helpers.js

@@ -31,10 +31,21 @@ export const transformChartDataForGlCharts = (
   };
 
   switch (type) {
+    case CHART_TYPES.BAR:
+      formattedData.datasets = [
+        {
+          name: 'all',
+          data: labels.map((label, i) => [label, datasets[0].data[i]]),
+        },
+      ];
+      break;
     case CHART_TYPES.STACKED_BAR:
-      formattedData.datasets = datasets.map(dataset => dataset.data);
-      formattedData.seriesNames = datasets.map(dataset => dataset.label);
-
+      formattedData.datasets.push(
+        ...datasets.map(dataset => ({
+          name: dataset.label,
+          data: dataset.data,
+        })),
+      );
       break;
     case CHART_TYPES.LINE:
       formattedData.datasets.push(
@@ -48,7 +59,6 @@ export const transformChartDataForGlCharts = (
     default:
       formattedData.datasets = { all: labels.map((label, i) => [label, datasets[0].data[i]]) };
   }
-
   return formattedData;
 };
 

ee/app/assets/javascripts/issues_analytics/components/issues_analytics.vue

@@ -182,7 +182,7 @@ export default {
 
       <gl-column-chart
         data-qa-selector="issues_analytics_graph"
-        :data="{ Full: data }"
+        :bars="[{ name: 'Full', data }]"
         :option="chartOptions"
         :y-axis-title="s__('IssuesAnalytics|Issues opened')"
         :x-axis-title="s__('IssuesAnalytics|Last 12 months') + ' (' + chartDateRange + ')'"

ee/app/assets/javascripts/vue_shared/components/members/table/members_table_cell.vue

 <script>
 import CEMembersTableCell from '~/vue_shared/components/members/table/members_table_cell.vue';
+import { canOverride } from '../utils';
 
 export default {
   name: 'MembersTableCell',
@@ -11,7 +12,7 @@ export default {
   },
   computed: {
     canOverride() {
-      return this.member.canOverride;
+      return canOverride(this.member);
     },
   },
   render(createElement) {

ee/app/assets/javascripts/vue_shared/components/members/utils.js

 import { __ } from '~/locale';
 import { generateBadges as CEGenerateBadges } from '~/vue_shared/components/members/utils';
 
+export {
+  isGroup,
+  isDirectMember,
+  isCurrentUser,
+  canRemove,
+  canResend,
+  canUpdate,
+} from '~/vue_shared/components/members/utils';
+
 export const generateBadges = (member, isCurrentUser) => [
   ...CEGenerateBadges(member, isCurrentUser),
   {
@@ -24,3 +33,5 @@ export const generateBadges = (member, isCurrentUser) => [
     variant: 'info',
   },
 ];
+
+export const canOverride = member => member.canOverride;

ee/changelogs/unreleased/276172-rename-cycle-analytics-with-value-stream-analytics-in-strings-u.yml

+---
+title: Rename "cycle analytics" with "value stream analytics" under /ee/spec
+merge_request: 46745
+author: Takuya Noguchi
+type: other

ee/config/feature_flags/licensed/group_coverage_reports.yml

----
-name: group_coverage_reports
-introduced_by_url: 
-rollout_issue_url: 
-type: licensed
-group: group::analytics
-default_enabled: true

ee/lib/ee/gitlab/repository_size_checker.rb

@@ -48,7 +48,7 @@ module EE
       end
 
       def remaining_additional_purchased_storage
-        additional_purchased_storage - total_excess_without_current_project
+        [additional_purchased_storage - total_excess_without_current_project, 0].max
       end
     end
   end

ee/spec/frontend/analytics/contribution_analytics/components/__snapshots__/column_chart_spec.js.snap

@@ -3,7 +3,7 @@
 exports[`Contribution Analytics Column Chart matches the snapshot 1`] = `
 <div>
   <gl-column-chart-stub
-    bars=""
+    bars="[object Object]"
     data="[object Object]"
     height="350"
     lines=""

ee/spec/frontend/analytics/cycle_analytics/__snapshots__/utils_spec.js.snap

 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Cycle analytics utils transformRawStages retains all the stage properties 1`] = `
+exports[`Value Stream Analytics utils transformRawStages retains all the stage properties 1`] = `
 Array [
   Object {
     "custom": false,

ee/spec/frontend/analytics/cycle_analytics/components/tasks_by_type/__snapshots__/tasks_by_type_chart_spec.js.snap

@@ -2,4 +2,4 @@
 
 exports[`TasksByTypeChart no data available should render the no data available message 1`] = `"<gl-stacked-column-chart-stub data=\\"\\" bars=\\"\\" lines=\\"\\" secondarydata=\\"\\" option=\\"[object Object]\\" presentation=\\"stacked\\" groupby=\\"\\" xaxistype=\\"category\\" xaxistitle=\\"Date\\" yaxistitle=\\"Number of tasks\\" secondarydatatitle=\\"\\" seriesnames=\\"\\" legendaveragetext=\\"Avg\\" legendmaxtext=\\"Max\\" legendmintext=\\"Min\\" legendcurrenttext=\\"Current\\" legendlayout=\\"inline\\" y-axis-type=\\"value\\"></gl-stacked-column-chart-stub>"`;
 
-exports[`TasksByTypeChart with data available should render the loading chart 1`] = `"<gl-stacked-column-chart-stub data=\\"0,1,2,5,2,3,2,4,1\\" bars=\\"\\" lines=\\"\\" secondarydata=\\"\\" option=\\"[object Object]\\" presentation=\\"stacked\\" groupby=\\"Group 1,Group 2,Group 3\\" xaxistype=\\"category\\" xaxistitle=\\"Date\\" yaxistitle=\\"Number of tasks\\" secondarydatatitle=\\"\\" seriesnames=\\"Cool label,Normal label\\" legendaveragetext=\\"Avg\\" legendmaxtext=\\"Max\\" legendmintext=\\"Min\\" legendcurrenttext=\\"Current\\" legendlayout=\\"inline\\" y-axis-type=\\"value\\"></gl-stacked-column-chart-stub>"`;
+exports[`TasksByTypeChart with data available should render the loading chart 1`] = `"<gl-stacked-column-chart-stub data=\\"\\" bars=\\"0,1,2,5,2,3,2,4,1\\" lines=\\"\\" secondarydata=\\"\\" option=\\"[object Object]\\" presentation=\\"stacked\\" groupby=\\"Group 1,Group 2,Group 3\\" xaxistype=\\"category\\" xaxistitle=\\"Date\\" yaxistitle=\\"Number of tasks\\" secondarydatatitle=\\"\\" seriesnames=\\"Cool label,Normal label\\" legendaveragetext=\\"Avg\\" legendmaxtext=\\"Max\\" legendmintext=\\"Min\\" legendcurrenttext=\\"Current\\" legendlayout=\\"inline\\" y-axis-type=\\"value\\"></gl-stacked-column-chart-stub>"`;

ee/spec/frontend/analytics/cycle_analytics/components/type_of_work_charts_spec.js

@@ -83,7 +83,7 @@ describe('TypeOfWorkCharts', () => {
     beforeEach(() => {
       wrapper = createComponent({
         initialGetters: {
-          tasksByTypeChartData: () => ({ groupBy: [], data: [], seriesNames: [] }),
+          tasksByTypeChartData: () => ({ groupBy: [], data: [] }),
         },
       });
     });

ee/spec/frontend/analytics/cycle_analytics/store/actions_spec.js

@@ -42,7 +42,7 @@ const stageEndpoint = ({ stageId }) =>
 
 jest.mock('~/flash');
 
-describe('Cycle analytics actions', () => {
+describe('Value Stream Analytics actions', () => {
   let state;
   let mock;
 

ee/spec/frontend/analytics/cycle_analytics/store/getters_spec.js

@@ -28,7 +28,7 @@ const milestoneValues = getFilterValues(filterMilestones);
 const labelValues = getFilterValues(filterLabels);
 const userValues = getFilterValues(filterUsers, { prop: 'name' });
 
-describe('Cycle analytics getters', () => {
+describe('Value Stream Analytics getters', () => {
   describe('hasNoAccessError', () => {
     beforeEach(() => {
       state = {

ee/spec/frontend/analytics/cycle_analytics/store/modules/type_of_work/getters_spec.js

@@ -19,7 +19,7 @@ describe('Type of work getters', () => {
 
     describe('with no data', () => {
       it('returns all required properties', () => {
-        expect(tasksByTypeChartData()).toEqual({ groupBy: [], data: [], seriesNames: [] });
+        expect(tasksByTypeChartData()).toEqual({ groupBy: [], data: [] });
       });
     });
   });

ee/spec/frontend/analytics/cycle_analytics/store/modules/type_of_work/mutations_spec.js

@@ -6,7 +6,7 @@ import { apiTasksByTypeData, rawTasksByTypeData } from '../../../mock_data';
 
 let state = null;
 
-describe('Cycle analytics mutations', () => {
+describe('Value Stream Analytics mutations', () => {
   beforeEach(() => {
     state = {};
   });

ee/spec/frontend/analytics/cycle_analytics/store/mutations_spec.js

@@ -16,7 +16,7 @@ import {
 
 let state = null;
 
-describe('Cycle analytics mutations', () => {
+describe('Value Stream Analytics mutations', () => {
   beforeEach(() => {
     state = {};
   });

ee/spec/frontend/analytics/cycle_analytics/utils_spec.js

@@ -41,7 +41,7 @@ import {
 
 const labelEventIds = labelEvents.map(ev => ev.identifier);
 
-describe('Cycle analytics utils', () => {
+describe('Value Stream Analytics utils', () => {
   describe('isStartEvent', () => {
     it('will return true for a valid start event', () => {
       expect(isStartEvent(startEvents[0])).toEqual(true);
@@ -227,10 +227,15 @@ describe('Cycle analytics utils', () => {
 
   describe('getTasksByTypeData', () => {
     let transformed = {};
-
     const groupBy = getDatesInRange(startDate, endDate, toYmd);
     // only return the values, drop the date which is the first paramater
-    const extractSeriesValues = ({ series }) => series.map(kv => kv[1]);
+    const extractSeriesValues = ({ label: { title: name }, series }) => {
+      return {
+        name,
+        data: series.map(kv => kv[1]),
+      };
+    };
+
     const data = rawTasksByTypeData.map(extractSeriesValues);
 
     const labels = rawTasksByTypeData.map(d => {
@@ -241,7 +246,7 @@ describe('Cycle analytics utils', () => {
     it('will return blank arrays if given no data', () => {
       [{ data: [], startDate, endDate }, [], {}].forEach(chartData => {
         transformed = getTasksByTypeData(chartData);
-        ['seriesNames', 'data', 'groupBy'].forEach(key => {
+        ['data', 'groupBy'].forEach(key => {
           expect(transformed[key]).toEqual([]);
         });
       });
@@ -253,17 +258,11 @@ describe('Cycle analytics utils', () => {
       });
 
       it('will return an object with the properties needed for the chart', () => {
-        ['seriesNames', 'data', 'groupBy'].forEach(key => {
+        ['data', 'groupBy'].forEach(key => {
           expect(transformed).toHaveProperty(key);
         });
       });
 
-      describe('seriesNames', () => {
-        it('returns the names of all the labels in the dataset', () => {
-          expect(transformed.seriesNames).toEqual(labels);
-        });
-      });
-
       describe('groupBy', () => {
         it('returns the date groupBy as an array', () => {
           expect(transformed.groupBy).toEqual(groupBy);
@@ -289,7 +288,7 @@ describe('Cycle analytics utils', () => {
 
         it('contains a value for each day in the groupBy', () => {
           transformed.data.forEach(d => {
-            expect(d).toHaveLength(transformed.groupBy.length);
+            expect(d.data).toHaveLength(transformed.groupBy.length);
           });
         });
       });

ee/spec/frontend/api_spec.js

@@ -200,7 +200,7 @@ describe('Api', () => {
     });
   });
 
-  describe('Cycle analytics', () => {
+  describe('Value Stream Analytics', () => {
     const createdBefore = '2019-11-18';
     const createdAfter = '2019-08-18';
     const groupId = 'counting-54321';

ee/spec/frontend/insights/mock_data.js

@@ -12,9 +12,12 @@ export const chartInfo = {
 
 export const barChartData = {
   labels: ['January', 'February'],
-  datasets: {
-    all: [['January', 1], ['February', 2]],
-  },
+  datasets: [
+    {
+      name: 'all',
+      data: [['January', 1], ['February', 2]],
+    },
+  ],
   xAxisTitle: 'Months',
   yAxisTitle: 'Issues',
 };
@@ -37,8 +40,16 @@ export const lineChartData = {
 
 export const stackedBarChartData = {
   labels: ['January', 'February'],
-  datasets: [[1, 2], [1, 2]],
-  seriesNames: ['Series 1', 'Series 2'],
+  datasets: [
+    {
+      name: 'Series 1',
+      data: [1, 2],
+    },
+    {
+      name: 'Series 2',
+      data: [1, 2],
+    },
+  ],
   xAxisTitle: 'Months',
   yAxisTitle: 'Issues',
 };

ee/spec/frontend/insights/stores/insights/helpers_spec.js

@@ -39,22 +39,9 @@ describe('Insights helpers', () => {
         datasets: [{ label: 'Dataset 1', data: [1] }, { label: 'Dataset 2', data: [2] }],
       };
 
-      expect(transformChartDataForGlCharts(chart, data).datasets).toEqual([[1], [2]]);
-    });
-
-    it('copies the dataset labels to seriesNames for stacked bar charts', () => {
-      const chart = {
-        type: CHART_TYPES.STACKED_BAR,
-        query: { group_by: 'month', issuable_type: 'issue' },
-      };
-      const data = {
-        labels: ['January', 'February'],
-        datasets: [{ label: 'Dataset 1', data: [1] }, { label: 'Dataset 2', data: [2] }],
-      };
-
-      expect(transformChartDataForGlCharts(chart, data).seriesNames).toEqual([
-        'Dataset 1',
-        'Dataset 2',
+      expect(transformChartDataForGlCharts(chart, data).datasets).toEqual([
+        { name: 'Dataset 1', data: [1] },
+        { name: 'Dataset 2', data: [2] },
       ]);
     });
 
@@ -74,7 +61,7 @@ describe('Insights helpers', () => {
       ]);
     });
 
-    it('creates an object of all containing an array of label / data pairs for bar charts', () => {
+    it('creates an array of objects containing an array of label / data pairs and a name for bar charts', () => {
       const chart = {
         type: CHART_TYPES.BAR,
         query: { group_by: 'month', issuable_type: 'issue' },
@@ -84,9 +71,9 @@ describe('Insights helpers', () => {
         datasets: [{ data: [1, 2] }],
       };
 
-      expect(transformChartDataForGlCharts(chart, data).datasets).toEqual({
-        all: [['January', 1], ['February', 2]],
-      });
+      expect(transformChartDataForGlCharts(chart, data).datasets).toEqual([
+        { name: 'all', data: [['January', 1], ['February', 2]] },
+      ]);
     });
 
     it('creates an object of all containing an array of label / data pairs for pie charts', () => {

ee/spec/frontend/insights/stores/insights/mutations_spec.js

@@ -107,11 +107,11 @@ describe('Insights mutations', () => {
     };
 
     const transformedData = {
-      datasets: [[1], [2]],
+      datasets: [{ name: 'Dataset 1', data: [1] }, { name: 'Dataset 2', data: [2] }],
       labels: ['January', 'February'],
       xAxisTitle: 'Months',
       yAxisTitle: 'Issues',
-      seriesNames: ['Dataset 1', 'Dataset 2'],
+      seriesNames: [],
     };
 
     beforeEach(() => {

ee/spec/frontend/vue_shared/components/members/table/members_table_spec.js

+import { mount, createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import { within } from '@testing-library/dom';
+import { member as memberMock, members } from 'jest/vue_shared/components/members/mock_data';
+import MembersTable from '~/vue_shared/components/members/table/members_table.vue';
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+describe('MemberList', () => {
+  let wrapper;
+
+  const createStore = (state = {}) => {
+    return new Vuex.Store({
+      state: {
+        members: [],
+        tableFields: [],
+        sourceId: 1,
+        currentUserId: 1,
+        ...state,
+      },
+    });
+  };
+
+  const createComponent = state => {
+    wrapper = mount(MembersTable, {
+      localVue,
+      store: createStore(state),
+      stubs: [
+        'member-avatar',
+        'member-source',
+        'expires-at',
+        'created-at',
+        'member-action-buttons',
+        'role-dropdown',
+        'remove-group-link-modal',
+        'expiration-datepicker',
+      ],
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  describe('fields', () => {
+    describe('"Actions" field', () => {
+      const memberCanOverride = {
+        ...memberMock,
+        source: { ...memberMock.source, id: 1 },
+        canOverride: true,
+      };
+
+      describe('when one of the members has `canOverride` permissions', () => {
+        it('renders the "Actions" field', () => {
+          createComponent({ members: [memberCanOverride], tableFields: ['actions'] });
+
+          expect(within(wrapper.element).queryByTestId('col-actions')).not.toBe(null);
+        });
+      });
+
+      describe('when none of the members have `canOverride` permissions', () => {
+        it('does not render the "Actions" field', () => {
+          createComponent({ members, tableFields: ['actions'] });
+
+          expect(within(wrapper.element).queryByTestId('col-actions')).toBe(null);
+        });
+      });
+    });
+  });
+});

ee/spec/frontend/vue_shared/components/members/utils_spec.js

 import { member as memberMock } from 'jest/vue_shared/components/members/mock_data';
-import { generateBadges } from 'ee/vue_shared/components/members/utils';
+import { generateBadges, canOverride } from 'ee/vue_shared/components/members/utils';
 
 describe('Members Utils', () => {
   describe('generateBadges', () => {
@@ -27,4 +27,14 @@ describe('Members Utils', () => {
       expect(generateBadges(member, true)).toContainEqual(expect.objectContaining(expected));
     });
   });
+
+  describe('canOverride', () => {
+    test.each`
+      member                                  | expected
+      ${{ ...memberMock, canOverride: true }} | ${true}
+      ${memberMock}                           | ${false}
+    `('returns $expected', ({ member, expected }) => {
+      expect(canOverride(member)).toBe(expected);
+    });
+  });
 });

ee/spec/frontend_integration/.eslintrc.yml

+---
+extends: ../../../spec/frontend_integration/.eslintrc.yml

ee/spec/frontend_integration/README.md

+## Frontend Integration Specs
+
+This directory contains Frontend integration specs. Go to `ee/spec/frontend` if you're looking for Frontend unit tests.
+
+Please see [the CE README for more info](../../../spec/frontend_integration/README.md).

ee/spec/frontend_integration/security_dashboard/__snapshots__/first_class_init_integration_spec.js.snap

+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Vulnerability Report error states has unavailable pages 1`] = `
+<div>
+  <section
+    class="row empty-state text-center"
+  >
+    <div
+      class="col-12"
+    >
+      <div
+        class="svg-250 svg-content"
+      >
+        <img
+          alt="Oops, something doesn't seem right."
+          class="gl-max-w-full"
+          src="/test/empty_state.svg"
+        />
+      </div>
+    </div>
+    <div
+      class="col-12"
+    >
+      <div
+        class="text-content gl-mx-auto gl-my-0 gl-p-5"
+      >
+        <h1
+          class="h4"
+        >
+          Oops, something doesn't seem right.
+        </h1>
+        <p>
+          Either you don't have permission to view this dashboard or the dashboard has not been setup. Please check your permission settings with your administrator or check your dashboard configurations to proceed.
+        </p>
+        <div>
+          <a
+            class="btn btn-success btn-md gl-button"
+            href="/test/dashboard_page"
+          >
+            <span
+              class="gl-button-text"
+            >
+              Learn more about setting up your dashboard
+            </span>
+          </a>
+        </div>
+      </div>
+    </div>
+  </section>
+</div>
+`;

ee/spec/frontend_integration/security_dashboard/__snapshots__/security_charts_init_integration_spec.js.snap

+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Security Charts default states sets up group-level 1`] = `
+<div>
+  <div
+    data-testid="security-charts-layout"
+  >
+    <h2>
+      Security Dashboard
+    </h2>
+    <div
+      class="gl-spinner-container gl-mt-6"
+    >
+      <span
+        aria-label="Loading"
+        class="align-text-bottom gl-spinner gl-spinner-dark gl-spinner-lg"
+      />
+    </div>
+    <div
+      class="security-charts gl-display-flex gl-flex-wrap"
+    />
+  </div>
+</div>
+`;
+
+exports[`Security Charts default states sets up instance-level 1`] = `
+<div>
+  <div
+    data-testid="security-charts-layout"
+  >
+    <h2>
+      Security Dashboard
+    </h2>
+    <div
+      class="gl-spinner-container gl-mt-6"
+    >
+      <span
+        aria-label="Loading"
+        class="align-text-bottom gl-spinner gl-spinner-dark gl-spinner-lg"
+      />
+    </div>
+    <div
+      class="security-charts gl-display-flex gl-flex-wrap"
+    />
+  </div>
+</div>
+`;
+
+exports[`Security Charts error states has unavailable pages 1`] = `
+<div>
+  <section
+    class="row empty-state text-center"
+  >
+    <div
+      class="col-12"
+    >
+      <div
+        class="svg-250 svg-content"
+      >
+        <img
+          alt="Oops, something doesn't seem right."
+          class="gl-max-w-full"
+          src="/test/empty_state.svg"
+        />
+      </div>
+    </div>
+    <div
+      class="col-12"
+    >
+      <div
+        class="text-content gl-mx-auto gl-my-0 gl-p-5"
+      >
+        <h1
+          class="h4"
+        >
+          Oops, something doesn't seem right.
+        </h1>
+        <p>
+          Either you don't have permission to view this dashboard or the dashboard has not been setup. Please check your permission settings with your administrator or check your dashboard configurations to proceed.
+        </p>
+        <div>
+          <a
+            class="btn btn-success btn-md gl-button"
+            href="/test/dashboard_page"
+          >
+            <span
+              class="gl-button-text"
+            >
+              Learn more about setting up your dashboard
+            </span>
+          </a>
+        </div>
+      </div>
+    </div>
+  </section>
+</div>
+`;

ee/spec/frontend_integration/security_dashboard/first_class_init_integration_spec.js

+import { TEST_HOST } from 'jest/helpers/test_constants';
+import { DASHBOARD_TYPES } from 'ee/security_dashboard/store/constants';
+import initVulnerabilityReport from 'ee/security_dashboard/first_class_init';
+
+const EMPTY_DIV = document.createElement('div');
+
+const TEST_DATASET = {
+  dashboardDocumentation: '/test/dashboard_page',
+  emptyStateSvgPath: '/test/empty_state.svg',
+  hasVulnerabilities: true,
+  link: '/test/link',
+  noPipelineRunScannersHelpPath: '/test/no_pipeline_run_page',
+  notEnabledScannersHelpPath: '/test/security_dashboard_not_enabled_page',
+  noVulnerabilitiesSvgPath: '/test/no_vulnerability_state.svg',
+  projectAddEndpoint: '/test/add-projects',
+  projectListEndpoint: '/test/list-projects',
+  securityDashboardHelpPath: '/test/security_dashboard_page',
+  svgPath: '/test/no_changes_state.svg',
+  vulnerabilitiesExportEndpoint: '/test/export-vulnerabilities',
+};
+
+describe('Vulnerability Report', () => {
+  let vm;
+  let root;
+
+  beforeEach(() => {
+    root = document.createElement('div');
+    document.body.appendChild(root);
+
+    global.jsdom.reconfigure({
+      url: `${TEST_HOST}/-/security/vulnerabilities`,
+    });
+  });
+
+  afterEach(() => {
+    if (vm) {
+      vm.$destroy();
+    }
+    vm = null;
+    root.remove();
+  });
+
+  const createComponent = ({ data, type }) => {
+    const el = document.createElement('div');
+    Object.assign(el.dataset, { ...TEST_DATASET, ...data });
+    root.appendChild(el);
+    vm = initVulnerabilityReport(el, type);
+  };
+
+  const createEmptyComponent = () => {
+    vm = initVulnerabilityReport(null, null);
+  };
+
+  describe('default states', () => {
+    it('sets up project-level', () => {
+      createComponent({
+        data: {
+          autoFixDocumentation: '/test/auto_fix_page',
+          pipelineSecurityBuildsFailedCount: 1,
+          pipelineSecurityBuildsFailedPath: '/test/faild_pipeline_02',
+          projectFullPath: '/test/project',
+        },
+        type: DASHBOARD_TYPES.PROJECT,
+      });
+
+      // These assertions will be expanded in issue #220290
+      expect(root).not.toStrictEqual(EMPTY_DIV);
+    });
+
+    it('sets up group-level', () => {
+      createComponent({ data: { groupFullPath: '/test/' }, type: DASHBOARD_TYPES.GROUP });
+
+      // These assertions will be expanded in issue #220290
+      expect(root).not.toStrictEqual(EMPTY_DIV);
+    });
+
+    it('sets up instance-level', () => {
+      createComponent({
+        data: { instanceDashboardSettingsPath: '/instance/settings_page' },
+        type: DASHBOARD_TYPES.INSTANCE,
+      });
+
+      // These assertions will be expanded in issue #220290
+      expect(root).not.toStrictEqual(EMPTY_DIV);
+    });
+  });
+
+  describe('error states', () => {
+    it('does not have an element', () => {
+      createEmptyComponent();
+
+      expect(root).toStrictEqual(EMPTY_DIV);
+    });
+
+    it('has unavailable pages', () => {
+      createComponent({ data: { isUnavailable: true } });
+
+      expect(root).toMatchSnapshot();
+    });
+  });
+});

ee/spec/frontend_integration/security_dashboard/security_charts_init_integration_spec.js

+import { TEST_HOST } from 'jest/helpers/test_constants';
+import { DASHBOARD_TYPES } from 'ee/security_dashboard/store/constants';
+import initSecurityCharts from 'ee/security_dashboard/security_charts_init';
+
+const EMPTY_DIV = document.createElement('div');
+
+const TEST_DATASET = {
+  link: '/test/link',
+  svgPath: '/test/no_changes_state.svg',
+  dashboardDocumentation: '/test/dashboard_page',
+  emptyStateSvgPath: '/test/empty_state.svg',
+};
+
+describe('Security Charts', () => {
+  let vm;
+  let root;
+
+  beforeEach(() => {
+    root = document.createElement('div');
+    document.body.appendChild(root);
+
+    global.jsdom.reconfigure({
+      url: `${TEST_HOST}/-/security/dashboard`,
+    });
+  });
+
+  afterEach(() => {
+    if (vm) {
+      vm.$destroy();
+    }
+    vm = null;
+    root.remove();
+  });
+
+  const createComponent = ({ data, type }) => {
+    const el = document.createElement('div');
+    Object.assign(el.dataset, { ...TEST_DATASET, ...data });
+    root.appendChild(el);
+    vm = initSecurityCharts(el, type);
+  };
+
+  const createEmptyComponent = () => {
+    vm = initSecurityCharts(null, null);
+  };
+
+  describe('default states', () => {
+    it('sets up group-level', () => {
+      createComponent({ data: { groupFullPath: '/test/' }, type: DASHBOARD_TYPES.GROUP });
+
+      expect(root).toMatchSnapshot();
+    });
+
+    it('sets up instance-level', () => {
+      createComponent({
+        data: { instanceDashboardSettingsPath: '/instance/settings_page' },
+        type: DASHBOARD_TYPES.INSTANCE,
+      });
+
+      expect(root).toMatchSnapshot();
+    });
+  });
+
+  describe('error states', () => {
+    it('does not have an element', () => {
+      createEmptyComponent();
+
+      expect(root).toStrictEqual(EMPTY_DIV);
+    });
+
+    it('has unavailable pages', () => {
+      createComponent({ data: { isUnavailable: true } });
+
+      expect(root).toMatchSnapshot();
+    });
+  });
+});

ee/spec/frontend_integration/test_setup.js

+import 'test_helpers/setup';

ee/spec/lib/ee/gitlab/repository_size_checker_spec.rb

@@ -197,6 +197,17 @@ RSpec.describe Gitlab::RepositorySizeChecker do
       end
 
       context 'without additional purchased storage' do
+        context 'when namespace has total_repository_size_excess but project is below limit' do
+          let(:total_repository_size_excess) { 50 }
+          let(:change_size) { 1.megabyte }
+          let(:limit) { 10 }
+          let(:current_size) { 5 }
+
+          it 'returns zero' do
+            expect(subject.exceeded_size(change_size)).to eq(0)
+          end
+        end
+
         include_examples 'checker size exceeded'
       end
     end

lib/gitlab/webpack/dev_server_middleware.rb

@@ -19,7 +19,6 @@ module Gitlab
       # disable SSL check since any cert used here will likely be self-signed
       def rewrite_env(env)
         env["rack.ssl_verify_none"] = true
-        env["HTTP_HOST"] = @proxy_host
         env
       end
 

locale/gitlab.pot

@@ -2294,6 +2294,9 @@ msgstr ""
 msgid "After a successful password update, you will be redirected to the login page where you can log in with your new password."
 msgstr ""
 
+msgid "After sign-out path"
+msgstr ""
+
 msgid "After that, you will not be able to use merge approvals or code quality as well as many other features."
 msgstr ""
 
@@ -2818,6 +2821,9 @@ msgstr ""
 msgid "An administrator changed the password for your GitLab account on %{link_to}."
 msgstr ""
 
+msgid "An alert has been resolved in %{project_path}."
+msgstr ""
+
 msgid "An alert has been triggered in %{project_path}."
 msgstr ""
 
@@ -11165,6 +11171,9 @@ msgstr ""
 msgid "Failed to load stacktrace."
 msgstr ""
 
+msgid "Failed to make repository read-only. %{reason}"
+msgstr ""
+
 msgid "Failed to mark this issue as a duplicate because referenced issue was not found."
 msgstr ""
 
@@ -24726,6 +24735,9 @@ msgstr ""
 msgid "Sign-in restrictions"
 msgstr ""
 
+msgid "Sign-in text"
+msgstr ""
+
 msgid "Sign-up restrictions"
 msgstr ""
 
@@ -29429,6 +29441,12 @@ msgstr ""
 msgid "View Documentation"
 msgstr ""
 
+msgid "View alert details at"
+msgstr ""
+
+msgid "View alert details."
+msgstr ""
+
 msgid "View all issues"
 msgstr ""
 

package.json

@@ -202,7 +202,7 @@
     "karma-mocha-reporter": "^2.2.5",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^4.0.2",
-    "markdownlint-cli": "0.23.2",
+    "markdownlint-cli": "0.24.0",
     "md5": "^2.2.1",
     "node-sass": "^4.14.1",
     "nodemon": "^2.0.4",

spec/controllers/projects/settings/repository_controller_spec.rb

@@ -23,13 +23,15 @@ RSpec.describe Projects::Settings::RepositoryController do
   describe 'PUT cleanup' do
     let(:object_map) { fixture_file_upload('spec/fixtures/bfg_object_map.txt') }
 
-    it 'enqueues a RepositoryCleanupWorker' do
-      allow(RepositoryCleanupWorker).to receive(:perform_async)
+    it 'enqueues a project cleanup' do
+      expect(Projects::CleanupService)
+        .to receive(:enqueue)
+        .with(project, user, anything)
+        .and_return(status: :success)
 
-      put :cleanup, params: { namespace_id: project.namespace, project_id: project, project: { object_map: object_map } }
+      put :cleanup, params: { namespace_id: project.namespace, project_id: project, project: { bfg_object_map: object_map } }
 
       expect(response).to redirect_to project_settings_repository_path(project)
-      expect(RepositoryCleanupWorker).to have_received(:perform_async).once
     end
   end
 

spec/frontend/monitoring/components/charts/column_spec.js

@@ -30,6 +30,7 @@ describe('Column component', () => {
           },
           metrics: [
             {
+              label: 'Mock data',
               result: [
                 {
                   metric: {},
@@ -96,7 +97,7 @@ describe('Column component', () => {
   describe('wrapped components', () => {
     describe('GitLab UI column chart', () => {
       it('receives data properties needed for proper chart render', () => {
-        expect(chartProps('data').values).toEqual(dataValues);
+        expect(chartProps('bars')).toEqual([{ name: 'Mock data', data: dataValues }]);
       });
 
       it('passes the y axis name correctly', () => {

spec/frontend/monitoring/components/charts/stacked_column_spec.js

@@ -44,19 +44,19 @@ describe('Stacked column chart component', () => {
     });
 
     it('data should match the graphData y value for each series', () => {
-      const data = findChart().props('data');
+      const data = findChart().props('bars');
 
       data.forEach((series, index) => {
         const { values } = stackedColumnMockedData.metrics[index].result[0];
-        expect(series).toEqual(values.map(value => value[1]));
+        expect(series.data).toEqual(values.map(value => value[1]));
       });
     });
 
-    it('series names should be the same as the graphData metrics labels', () => {
-      const seriesNames = findChart().props('seriesNames');
+    it('data should be the same length as the graphData metrics labels', () => {
+      const barDataProp = findChart().props('bars');
 
-      expect(seriesNames).toHaveLength(stackedColumnMockedData.metrics.length);
-      seriesNames.forEach((name, index) => {
+      expect(barDataProp).toHaveLength(stackedColumnMockedData.metrics.length);
+      barDataProp.forEach(({ name }, index) => {
         expect(stackedColumnMockedData.metrics[index].label).toBe(name);
       });
     });

spec/frontend/projects/pipelines/charts/components/app_spec.js

@@ -45,7 +45,7 @@ describe('ProjectsPipelinesChartsApp', () => {
       expect(chart.exists()).toBeTruthy();
       expect(chart.props('yAxisTitle')).toBe('Minutes');
       expect(chart.props('xAxisTitle')).toBe('Commit');
-      expect(chart.props('data')).toBe(wrapper.vm.timesChartTransformedData);
+      expect(chart.props('bars')).toBe(wrapper.vm.timesChartTransformedData);
       expect(chart.props('option')).toBe(wrapper.vm.$options.timesChartOptions);
     });
   });

spec/frontend/vue_shared/components/members/table/members_table_spec.js

@@ -3,6 +3,7 @@ import Vuex from 'vuex';
 import {
   getByText as getByTextHelper,
   getByTestId as getByTestIdHelper,
+  within,
 } from '@testing-library/dom';
 import { GlBadge } from '@gitlab/ui';
 import MembersTable from '~/vue_shared/components/members/table/members_table.vue';
@@ -28,6 +29,7 @@ describe('MemberList', () => {
         members: [],
         tableFields: [],
         sourceId: 1,
+        currentUserId: 1,
         ...state,
       },
     });
@@ -62,12 +64,16 @@ describe('MemberList', () => {
   });
 
   describe('fields', () => {
-    const memberCanUpdate = {
+    const directMember = {
       ...memberMock,
-      canUpdate: true,
       source: { ...memberMock.source, id: 1 },
     };
 
+    const memberCanUpdate = {
+      ...directMember,
+      canUpdate: true,
+    };
+
     it.each`
       field           | label               | member             | expectedComponent
       ${'account'}    | ${'Account'}        | ${memberMock}      | ${MemberAvatar}
@@ -96,19 +102,60 @@ describe('MemberList', () => {
       }
     });
 
-    it('renders "Actions" field for screen readers', () => {
-      createComponent({ members: [memberMock], tableFields: ['actions'] });
+    describe('"Actions" field', () => {
+      it('renders "Actions" field for screen readers', () => {
+        createComponent({ members: [memberCanUpdate], tableFields: ['actions'] });
 
-      const actionField = getByTestId('col-actions');
+        const actionField = getByTestId('col-actions');
 
-      expect(actionField.exists()).toBe(true);
-      expect(actionField.classes('gl-sr-only')).toBe(true);
-      expect(
-        wrapper
-          .find(`[data-label="Actions"][role="cell"]`)
-          .find(MemberActionButtons)
-          .exists(),
-      ).toBe(true);
+        expect(actionField.exists()).toBe(true);
+        expect(actionField.classes('gl-sr-only')).toBe(true);
+        expect(
+          wrapper
+            .find(`[data-label="Actions"][role="cell"]`)
+            .find(MemberActionButtons)
+            .exists(),
+        ).toBe(true);
+      });
+
+      describe('when user is not logged in', () => {
+        it('does not render the "Actions" field', () => {
+          createComponent({ currentUserId: null, tableFields: ['actions'] });
+
+          expect(within(wrapper.element).queryByTestId('col-actions')).toBe(null);
+        });
+      });
+
+      const memberCanRemove = {
+        ...directMember,
+        canRemove: true,
+      };
+
+      describe.each`
+        permission     | members
+        ${'canUpdate'} | ${[memberCanUpdate]}
+        ${'canRemove'} | ${[memberCanRemove]}
+        ${'canResend'} | ${[invite]}
+      `('when one of the members has $permission permissions', ({ members }) => {
+        it('renders the "Actions" field', () => {
+          createComponent({ members, tableFields: ['actions'] });
+
+          expect(getByTestId('col-actions').exists()).toBe(true);
+        });
+      });
+
+      describe.each`
+        permission     | members
+        ${'canUpdate'} | ${[memberMock]}
+        ${'canRemove'} | ${[memberMock]}
+        ${'canResend'} | ${[{ ...invite, invite: { ...invite.invite, canResend: false } }]}
+      `('when none of the members have $permission permissions', ({ members }) => {
+        it('does not render the "Actions" field', () => {
+          createComponent({ members, tableFields: ['actions'] });
+
+          expect(within(wrapper.element).queryByTestId('col-actions')).toBe(null);
+        });
+      });
     });
   });
 

spec/frontend/vue_shared/components/members/utils_spec.js

-import { generateBadges } from '~/vue_shared/components/members/utils';
-import { member as memberMock } from './mock_data';
+import {
+  generateBadges,
+  isGroup,
+  isDirectMember,
+  isCurrentUser,
+  canRemove,
+  canResend,
+  canUpdate,
+  canOverride,
+} from '~/vue_shared/components/members/utils';
+import { member as memberMock, group, invite } from './mock_data';
+
+const DIRECT_MEMBER_ID = 178;
+const INHERITED_MEMBER_ID = 179;
+const IS_CURRENT_USER_ID = 123;
+const IS_NOT_CURRENT_USER_ID = 124;
 
 describe('Members Utils', () => {
   describe('generateBadges', () => {
@@ -26,4 +40,83 @@ describe('Members Utils', () => {
       expect(generateBadges(member, true)).toContainEqual(expect.objectContaining(expected));
     });
   });
+
+  describe('isGroup', () => {
+    test.each`
+      member        | expected
+      ${group}      | ${true}
+      ${memberMock} | ${false}
+    `('returns $expected', ({ member, expected }) => {
+      expect(isGroup(member)).toBe(expected);
+    });
+  });
+
+  describe('isDirectMember', () => {
+    test.each`
+      sourceId               | expected
+      ${DIRECT_MEMBER_ID}    | ${true}
+      ${INHERITED_MEMBER_ID} | ${false}
+    `('returns $expected', ({ sourceId, expected }) => {
+      expect(isDirectMember(memberMock, sourceId)).toBe(expected);
+    });
+  });
+
+  describe('isCurrentUser', () => {
+    test.each`
+      currentUserId             | expected
+      ${IS_CURRENT_USER_ID}     | ${true}
+      ${IS_NOT_CURRENT_USER_ID} | ${false}
+    `('returns $expected', ({ currentUserId, expected }) => {
+      expect(isCurrentUser(memberMock, currentUserId)).toBe(expected);
+    });
+  });
+
+  describe('canRemove', () => {
+    const memberCanRemove = {
+      ...memberMock,
+      canRemove: true,
+    };
+
+    test.each`
+      member             | sourceId               | expected
+      ${memberCanRemove} | ${DIRECT_MEMBER_ID}    | ${true}
+      ${memberCanRemove} | ${INHERITED_MEMBER_ID} | ${false}
+      ${memberMock}      | ${INHERITED_MEMBER_ID} | ${false}
+    `('returns $expected', ({ member, sourceId, expected }) => {
+      expect(canRemove(member, sourceId)).toBe(expected);
+    });
+  });
+
+  describe('canResend', () => {
+    test.each`
+      member                                                           | expected
+      ${invite}                                                        | ${true}
+      ${{ ...invite, invite: { ...invite.invite, canResend: false } }} | ${false}
+    `('returns $expected', ({ member, sourceId, expected }) => {
+      expect(canResend(member, sourceId)).toBe(expected);
+    });
+  });
+
+  describe('canUpdate', () => {
+    const memberCanUpdate = {
+      ...memberMock,
+      canUpdate: true,
+    };
+
+    test.each`
+      member             | currentUserId             | sourceId               | expected
+      ${memberCanUpdate} | ${IS_NOT_CURRENT_USER_ID} | ${DIRECT_MEMBER_ID}    | ${true}
+      ${memberCanUpdate} | ${IS_CURRENT_USER_ID}     | ${DIRECT_MEMBER_ID}    | ${false}
+      ${memberCanUpdate} | ${IS_CURRENT_USER_ID}     | ${INHERITED_MEMBER_ID} | ${false}
+      ${memberMock}      | ${IS_NOT_CURRENT_USER_ID} | ${DIRECT_MEMBER_ID}    | ${false}
+    `('returns $expected', ({ member, currentUserId, sourceId, expected }) => {
+      expect(canUpdate(member, currentUserId, sourceId)).toBe(expected);
+    });
+  });
+
+  describe('canOverride', () => {
+    it('returns `false`', () => {
+      expect(canOverride(memberMock)).toBe(false);
+    });
+  });
 });

spec/mailers/emails/projects_spec.rb

@@ -32,19 +32,13 @@ RSpec.describe Emails::Projects do
   describe '#prometheus_alert_fired_email' do
     let(:default_title) { Gitlab::AlertManagement::Payload::Generic::DEFAULT_TITLE }
     let(:payload) { { 'startsAt' => Time.now.rfc3339 } }
-    let(:alert_attributes) { build(:alert_management_alert, :from_payload, payload: payload, project: project).attributes }
+    let(:alert) { create(:alert_management_alert, :from_payload, payload: payload, project: project) }
 
     subject do
-      Notify.prometheus_alert_fired_email(project.id, user.id, alert_attributes)
+      Notify.prometheus_alert_fired_email(project, user, alert)
     end
 
-    context 'missing required attributes' do
-      let(:alert_attributes) { build(:alert_management_alert, :prometheus, :from_payload, payload: payload, project: project).attributes }
-
-      it_behaves_like 'no email'
-    end
-
-    context 'with minimum required attributes' do
+    context 'with empty payload' do
       let(:payload) { {} }
 
       it_behaves_like 'an email sent from GitLab'
@@ -58,6 +52,7 @@ RSpec.describe Emails::Projects do
       it 'has expected content' do
         is_expected.to have_body_text('An alert has been triggered')
         is_expected.to have_body_text(project.full_path)
+        is_expected.to have_body_text(alert.details_url)
         is_expected.not_to have_body_text('Description:')
         is_expected.not_to have_body_text('Environment:')
         is_expected.not_to have_body_text('Metric:')
@@ -78,6 +73,7 @@ RSpec.describe Emails::Projects do
       it 'has expected content' do
         is_expected.to have_body_text('An alert has been triggered')
         is_expected.to have_body_text(project.full_path)
+        is_expected.to have_body_text(alert.details_url)
         is_expected.to have_body_text('Description:')
         is_expected.to have_body_text('alert description')
         is_expected.not_to have_body_text('Environment:')
@@ -101,6 +97,7 @@ RSpec.describe Emails::Projects do
       it 'has expected content' do
         is_expected.to have_body_text('An alert has been triggered')
         is_expected.to have_body_text(project.full_path)
+        is_expected.to have_body_text(alert.details_url)
         is_expected.to have_body_text('Environment:')
         is_expected.to have_body_text(environment.name)
         is_expected.not_to have_body_text('Description:')
@@ -112,7 +109,7 @@ RSpec.describe Emails::Projects do
       let_it_be(:prometheus_alert) { create(:prometheus_alert, project: project) }
       let_it_be(:environment) { prometheus_alert.environment }
 
-      let(:alert_attributes) { build(:alert_management_alert, :prometheus, :from_payload, payload: payload, project: project).attributes }
+      let(:alert) { create(:alert_management_alert, :prometheus, :from_payload, payload: payload, project: project) }
       let(:title) { "#{prometheus_alert.title} #{prometheus_alert.computed_operator} #{prometheus_alert.threshold}" }
       let(:metrics_url) { metrics_project_environment_url(project, environment) }
 
@@ -135,6 +132,7 @@ RSpec.describe Emails::Projects do
       it 'has expected content' do
         is_expected.to have_body_text('An alert has been triggered')
         is_expected.to have_body_text(project.full_path)
+        is_expected.to have_body_text(alert.details_url)
         is_expected.to have_body_text('Environment:')
         is_expected.to have_body_text(environment.name)
         is_expected.to have_body_text('Metric:')
@@ -143,5 +141,23 @@ RSpec.describe Emails::Projects do
         is_expected.not_to have_body_text('Description:')
       end
     end
+
+    context 'resolved' do
+      let_it_be(:alert) { create(:alert_management_alert, :resolved, project: project) }
+
+      it_behaves_like 'an email sent from GitLab'
+      it_behaves_like 'it should not have Gmail Actions links'
+      it_behaves_like 'a user cannot unsubscribe through footer link'
+
+      it 'has expected subject' do
+        is_expected.to have_subject("#{project.name} | Alert: #{alert.title}")
+      end
+
+      it 'has expected content' do
+        is_expected.to have_body_text('An alert has been resolved')
+        is_expected.to have_body_text(project.full_path)
+        is_expected.to have_body_text(alert.details_url)
+      end
+    end
   end
 end

spec/requests/api/files_spec.rb

@@ -73,18 +73,20 @@ RSpec.describe API::Files do
 
   describe "HEAD /projects/:id/repository/files/:file_path" do
     shared_examples_for 'repository files' do
+      let(:options) { {} }
+
       it 'returns 400 when file path is invalid' do
-        head api(route(rouge_file_path), current_user), params: params
+        head api(route(rouge_file_path), current_user, **options), params: params
 
         expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it_behaves_like 'when path is absolute' do
-        subject { head api(route(absolute_path), current_user), params: params }
+        subject { head api(route(absolute_path), current_user, **options), params: params }
       end
 
       it 'returns file attributes in headers' do
-        head api(route(file_path), current_user), params: params
+        head api(route(file_path), current_user, **options), params: params
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(response.headers['X-Gitlab-File-Path']).to eq(CGI.unescape(file_path))
@@ -98,7 +100,7 @@ RSpec.describe API::Files do
         file_path = "files%2Fjs%2Fcommit%2Ejs%2Ecoffee"
         params[:ref] = "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9"
 
-        head api(route(file_path), current_user), params: params
+        head api(route(file_path), current_user, **options), params: params
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(response.headers['X-Gitlab-File-Name']).to eq('commit.js.coffee')
@@ -107,7 +109,7 @@ RSpec.describe API::Files do
 
       context 'when mandatory params are not given' do
         it "responds with a 400 status" do
-          head api(route("any%2Ffile"), current_user)
+          head api(route("any%2Ffile"), current_user, **options)
 
           expect(response).to have_gitlab_http_status(:bad_request)
         end
@@ -117,7 +119,7 @@ RSpec.describe API::Files do
         it "responds with a 404 status" do
           params[:ref] = 'master'
 
-          head api(route('app%2Fmodels%2Fapplication%2Erb'), current_user), params: params
+          head api(route('app%2Fmodels%2Fapplication%2Erb'), current_user, **options), params: params
 
           expect(response).to have_gitlab_http_status(:not_found)
         end
@@ -127,7 +129,7 @@ RSpec.describe API::Files do
         include_context 'disabled repository'
 
         it "responds with a 403 status" do
-          head api(route(file_path), current_user), params: params
+          head api(route(file_path), current_user, **options), params: params
 
           expect(response).to have_gitlab_http_status(:forbidden)
         end
@@ -154,8 +156,8 @@ RSpec.describe API::Files do
     context 'when PATs are used' do
       it_behaves_like 'repository files' do
         let(:token) { create(:personal_access_token, scopes: ['read_repository'], user: user) }
-        let(:current_user) { user }
-        let(:api_user) { { personal_access_token: token } }
+        let(:current_user) { nil }
+        let(:options) { { personal_access_token: token } }
       end
     end
 
@@ -174,21 +176,21 @@ RSpec.describe API::Files do
 
   describe "GET /projects/:id/repository/files/:file_path" do
     shared_examples_for 'repository files' do
-      let(:api_user) { current_user }
+      let(:options) { {} }
 
       it 'returns 400 for invalid file path' do
-        get api(route(rouge_file_path), api_user), params: params
+        get api(route(rouge_file_path), api_user, **options), params: params
 
         expect(response).to have_gitlab_http_status(:bad_request)
         expect(json_response['error']).to eq(invalid_file_message)
       end
 
       it_behaves_like 'when path is absolute' do
-        subject { get api(route(absolute_path), api_user), params: params }
+        subject { get api(route(absolute_path), api_user, **options), params: params }
       end
 
       it 'returns file attributes as json' do
-        get api(route(file_path), api_user), params: params
+        get api(route(file_path), api_user, **options), params: params
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['file_path']).to eq(CGI.unescape(file_path))
@@ -201,10 +203,10 @@ RSpec.describe API::Files do
       it 'returns json when file has txt extension' do
         file_path = "bar%2Fbranch-test.txt"
 
-        get api(route(file_path), api_user), params: params
+        get api(route(file_path), api_user, **options), params: params
 
         expect(response).to have_gitlab_http_status(:ok)
-        expect(response.content_type).to eq('application/json')
+        expect(response.media_type).to eq('application/json')
       end
 
       context 'with filename with pathspec characters' do
@@ -218,7 +220,7 @@ RSpec.describe API::Files do
         it 'returns JSON wth commit SHA' do
           params[:ref] = 'master'
 
-          get api(route(file_path), api_user), params: params
+          get api(route(file_path), api_user, **options), params: params
 
           expect(response).to have_gitlab_http_status(:ok)
           expect(json_response['file_path']).to eq(file_path)
@@ -232,7 +234,7 @@ RSpec.describe API::Files do
         file_path = "files%2Fjs%2Fcommit%2Ejs%2Ecoffee"
         params[:ref] = "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9"
 
-        get api(route(file_path), api_user), params: params
+        get api(route(file_path), api_user, **options), params: params
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['file_name']).to eq('commit.js.coffee')
@@ -244,7 +246,7 @@ RSpec.describe API::Files do
         url = route(file_path) + "/raw"
         expect(Gitlab::Workhorse).to receive(:send_git_blob)
 
-        get api(url, api_user), params: params
+        get api(url, api_user, **options), params: params
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true"
@@ -253,7 +255,7 @@ RSpec.describe API::Files do
       it 'returns blame file info' do
         url = route(file_path) + '/blame'
 
-        get api(url, api_user), params: params
+        get api(url, api_user, **options), params: params
 
         expect(response).to have_gitlab_http_status(:ok)
       end
@@ -261,14 +263,14 @@ RSpec.describe API::Files do
       it 'sets inline content disposition by default' do
         url = route(file_path) + "/raw"
 
-        get api(url, api_user), params: params
+        get api(url, api_user, **options), params: params
 
         expect(headers['Content-Disposition']).to eq(%q(inline; filename="popen.rb"; filename*=UTF-8''popen.rb))
       end
 
       context 'when mandatory params are not given' do
         it_behaves_like '400 response' do
-          let(:request) { get api(route("any%2Ffile"), current_user) }
+          let(:request) { get api(route("any%2Ffile"), current_user, **options) }
         end
       end
 
@@ -276,7 +278,7 @@ RSpec.describe API::Files do
         let(:params) { { ref: 'master' } }
 
         it_behaves_like '404 response' do
-          let(:request) { get api(route('app%2Fmodels%2Fapplication%2Erb'), api_user), params: params }
+          let(:request) { get api(route('app%2Fmodels%2Fapplication%2Erb'), api_user, **options), params: params }
           let(:message) { '404 File Not Found' }
         end
       end
@@ -285,7 +287,7 @@ RSpec.describe API::Files do
         include_context 'disabled repository'
 
         it_behaves_like '403 response' do
-          let(:request) { get api(route(file_path), api_user), params: params }
+          let(:request) { get api(route(file_path), api_user, **options), params: params }
         end
       end
     end
@@ -294,6 +296,7 @@ RSpec.describe API::Files do
       it_behaves_like 'repository files' do
         let(:project) { create(:project, :public, :repository) }
         let(:current_user) { nil }
+        let(:api_user) { nil }
       end
     end
 
@@ -301,7 +304,8 @@ RSpec.describe API::Files do
       it_behaves_like 'repository files' do
         let(:token) { create(:personal_access_token, scopes: ['read_repository'], user: user) }
         let(:current_user) { user }
-        let(:api_user) { { personal_access_token: token } }
+        let(:api_user) { nil }
+        let(:options) { { personal_access_token: token } }
       end
     end
 
@@ -315,6 +319,7 @@ RSpec.describe API::Files do
     context 'when authenticated', 'as a developer' do
       it_behaves_like 'repository files' do
         let(:current_user) { user }
+        let(:api_user) { user }
       end
     end
 
@@ -687,7 +692,7 @@ RSpec.describe API::Files do
         post api(route("new_file_with_author%2Etxt"), user), params: params
 
         expect(response).to have_gitlab_http_status(:created)
-        expect(response.content_type).to eq('application/json')
+        expect(response.media_type).to eq('application/json')
         last_commit = project.repository.commit.raw
         expect(last_commit.author_email).to eq(author_email)
         expect(last_commit.author_name).to eq(author_name)

spec/services/alert_management/process_prometheus_alert_service_spec.rb

@@ -11,9 +11,16 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
 
   describe '#execute' do
     let(:service) { described_class.new(project, nil, payload) }
-    let(:incident_management_setting) { double(auto_close_incident?: auto_close_incident, create_issue?: create_issue) }
     let(:auto_close_incident) { true }
     let(:create_issue) { true }
+    let(:send_email) { true }
+    let(:incident_management_setting) do
+      double(
+        auto_close_incident?: auto_close_incident,
+        create_issue?: create_issue,
+        send_email?: send_email
+      )
+    end
 
     before do
       allow(service)
@@ -55,6 +62,7 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
 
           it_behaves_like 'adds an alert management alert event'
           it_behaves_like 'processes incident issues'
+          it_behaves_like 'Alert Notification Service sends notification email'
 
           context 'existing alert is resolved' do
             let!(:alert) { create(:alert_management_alert, :resolved, project: project, fingerprint: fingerprint) }
@@ -92,28 +100,48 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
             end
           end
 
-          context 'when auto-alert creation is disabled' do
+          context 'when auto-creation of issues is disabled' do
             let(:create_issue) { false }
 
             it_behaves_like 'does not process incident issues'
           end
+
+          context 'when emails are disabled' do
+            let(:send_email) { false }
+
+            it 'does not send notification' do
+              expect(NotificationService).not_to receive(:new)
+
+              expect(subject).to be_success
+            end
+          end
         end
 
         context 'when alert does not exist' do
           context 'when alert can be created' do
             it_behaves_like 'creates an alert management alert'
+            it_behaves_like 'Alert Notification Service sends notification email'
+            it_behaves_like 'processes incident issues'
 
             it 'creates a system note corresponding to alert creation' do
               expect { subject }.to change(Note, :count).by(1)
             end
 
-            it_behaves_like 'processes incident issues'
-
             context 'when auto-alert creation is disabled' do
               let(:create_issue) { false }
 
               it_behaves_like 'does not process incident issues'
             end
+
+            context 'when emails are disabled' do
+              let(:send_email) { false }
+
+              it 'does not send notification' do
+                expect(NotificationService).not_to receive(:new)
+
+                expect(subject).to be_success
+              end
+            end
           end
 
           context 'when alert cannot be created' do
@@ -125,6 +153,9 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
               allow(service).to receive_message_chain(:alert, :errors).and_return(errors)
             end
 
+            it_behaves_like 'Alert Notification Service sends no notifications', http_status: :bad_request
+            it_behaves_like 'does not process incident issues due to error', http_status: :bad_request
+
             it 'writes a warning to the log' do
               expect(Gitlab::AppLogger).to receive(:warn).with(
                 message: 'Unable to create AlertManagement::Alert',
@@ -134,8 +165,6 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
 
               execute
             end
-
-            it_behaves_like 'does not process incident issues'
           end
 
           it { is_expected.to be_success }
@@ -148,6 +177,9 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
 
         context 'when auto_resolve_incident set to true' do
           context 'when status can be changed' do
+            it_behaves_like 'Alert Notification Service sends notification email'
+            it_behaves_like 'does not process incident issues'
+
             it 'resolves an existing alert' do
               expect { execute }.to change { alert.reload.resolved? }.to(true)
             end
@@ -185,6 +217,8 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
 
               execute
             end
+
+            it_behaves_like 'Alert Notification Service sends notification email'
           end
 
           it { is_expected.to be_success }
@@ -197,6 +231,16 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
             expect { execute }.not_to change { alert.reload.resolved? }
           end
         end
+
+        context 'when emails are disabled' do
+          let(:send_email) { false }
+
+          it 'does not send notification' do
+            expect(NotificationService).not_to receive(:new)
+
+            expect(subject).to be_success
+          end
+        end
       end
 
       context 'environment given' do

spec/services/notification_service_spec.rb

@@ -3100,26 +3100,26 @@ RSpec.describe NotificationService, :mailer do
   end
 
   describe '#prometheus_alerts_fired' do
-    let!(:project) { create(:project) }
-    let!(:master) { create(:user) }
-    let!(:developer) { create(:user) }
-    let(:alert_attributes) { build(:alert_management_alert, project: project).attributes }
+    let_it_be(:project) { create(:project) }
+    let_it_be(:master) { create(:user) }
+    let_it_be(:developer) { create(:user) }
+    let_it_be(:alert) { create(:alert_management_alert, project: project) }
 
     before do
       project.add_maintainer(master)
     end
 
     it 'sends the email to owners and masters' do
-      expect(Notify).to receive(:prometheus_alert_fired_email).with(project.id, master.id, alert_attributes).and_call_original
-      expect(Notify).to receive(:prometheus_alert_fired_email).with(project.id, project.owner.id, alert_attributes).and_call_original
-      expect(Notify).not_to receive(:prometheus_alert_fired_email).with(project.id, developer.id, alert_attributes)
+      expect(Notify).to receive(:prometheus_alert_fired_email).with(project, master, alert).and_call_original
+      expect(Notify).to receive(:prometheus_alert_fired_email).with(project, project.owner, alert).and_call_original
+      expect(Notify).not_to receive(:prometheus_alert_fired_email).with(project, developer, alert)
 
-      subject.prometheus_alerts_fired(project, [alert_attributes])
+      subject.prometheus_alerts_fired(project, [alert])
     end
 
     it_behaves_like 'project emails are disabled' do
       let(:notification_target)  { project }
-      let(:notification_trigger) { subject.prometheus_alerts_fired(project, [alert_attributes]) }
+      let(:notification_trigger) { subject.prometheus_alerts_fired(project, [alert]) }
 
       around do |example|
         perform_enqueued_jobs { example.run }

spec/services/projects/alerting/notify_service_spec.rb

@@ -129,6 +129,12 @@ RSpec.describe Projects::Alerting::NotifyService do
                   it { expect { subject }.to change { issue.reload.state }.from('opened').to('closed') }
                   it { expect { subject }.to change(ResourceStateEvent, :count).by(1) }
                 end
+
+                context 'with issue enabled' do
+                  let(:issue_enabled) { true }
+
+                  it_behaves_like 'does not process incident issues'
+                end
               end
             end
 

spec/services/projects/cleanup_service_spec.rb

@@ -3,14 +3,84 @@
 require 'spec_helper'
 
 RSpec.describe Projects::CleanupService do
-  let(:project) { create(:project, :repository, bfg_object_map: fixture_file_upload('spec/fixtures/bfg_object_map.txt')) }
-  let(:object_map) { project.bfg_object_map }
+  subject(:service) { described_class.new(project) }
 
-  let(:cleaner) { service.__send__(:repository_cleaner) }
+  describe '.enqueue' do
+    let_it_be(:project) { create(:project, :repository) }
+    let_it_be(:user) { create(:user) }
 
-  subject(:service) { described_class.new(project) }
+    let(:object_map_file) { fixture_file_upload('spec/fixtures/bfg_object_map.txt') }
+
+    subject(:enqueue) { described_class.enqueue(project, user, object_map_file) }
+
+    it 'makes the repository read-only' do
+      expect { enqueue }
+        .to change(project, :repository_read_only?)
+        .from(false)
+        .to(true)
+    end
+
+    it 'sets the bfg_object_map of the project' do
+      enqueue
+
+      expect(project.bfg_object_map.read).to eq(object_map_file.read)
+    end
+
+    it 'enqueues a RepositoryCleanupWorker' do
+      enqueue
+
+      expect(RepositoryCleanupWorker.jobs.count).to eq(1)
+    end
+
+    it 'returns success' do
+      expect(enqueue[:status]).to eq(:success)
+    end
+
+    it 'returns an error if making the repository read-only fails' do
+      project.set_repository_read_only!
+
+      expect(enqueue[:status]).to eq(:error)
+    end
+
+    it 'returns an error if updating the project fails' do
+      expect_next_instance_of(Projects::UpdateService) do |service|
+        expect(service).to receive(:execute).and_return(status: :error)
+      end
+
+      expect(enqueue[:status]).to eq(:error)
+      expect(project.reload.repository_read_only?).to be_falsy
+    end
+  end
+
+  describe '.cleanup_after' do
+    let(:project) { create(:project, :repository, bfg_object_map: fixture_file_upload('spec/fixtures/bfg_object_map.txt')) }
+
+    subject(:cleanup_after) { described_class.cleanup_after(project) }
+
+    before do
+      project.set_repository_read_only!
+    end
+
+    it 'sets the repository read-write' do
+      expect { cleanup_after }.to change(project, :repository_read_only?).from(true).to(false)
+    end
+
+    it 'removes the BFG object map' do
+      cleanup_after
+
+      expect(project.bfg_object_map).not_to be_exist
+    end
+  end
 
   describe '#execute' do
+    let(:project) { create(:project, :repository, bfg_object_map: fixture_file_upload('spec/fixtures/bfg_object_map.txt')) }
+    let(:object_map) { project.bfg_object_map }
+    let(:cleaner) { service.__send__(:repository_cleaner) }
+
+    before do
+      project.set_repository_read_only!
+    end
+
     it 'runs the apply_bfg_object_map_stream gitaly RPC' do
       expect(cleaner).to receive(:apply_bfg_object_map_stream).with(kind_of(IO))
 
@@ -37,6 +107,13 @@ RSpec.describe Projects::CleanupService do
       expect(object_map.exists?).to be_falsy
     end
 
+    it 'makes the repository read-write again' do
+      expect { service.execute }
+        .to change(project, :repository_read_only?)
+        .from(true)
+        .to(false)
+    end
+
     context 'with a tainted merge request diff' do
       let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
       let(:diff) { merge_request.merge_request_diff }

spec/workers/repository_cleanup_worker_spec.rb

@@ -40,6 +40,8 @@ RSpec.describe RepositoryCleanupWorker do
   describe '#sidekiq_retries_exhausted' do
     let(:job) { { 'args' => [project.id, user.id], 'error_message' => 'Error' } }
 
+    subject(:sidekiq_retries_exhausted) { described_class.sidekiq_retries_exhausted_block.call(job, StandardError.new) }
+
     it 'does not send a failure notification for a RecordNotFound error' do
       expect(NotificationService).not_to receive(:new)
 
@@ -51,7 +53,13 @@ RSpec.describe RepositoryCleanupWorker do
         expect(service).to receive(:repository_cleanup_failure).with(project, user, 'Error')
       end
 
-      described_class.sidekiq_retries_exhausted_block.call(job, StandardError.new)
+      sidekiq_retries_exhausted
+    end
+
+    it 'cleans up the attempt' do
+      expect(Projects::CleanupService).to receive(:cleanup_after).with(project)
+
+      sidekiq_retries_exhausted
     end
   end
 end

yarn.lock

@@ -7590,6 +7590,13 @@ linkify-it@^2.0.0:
   dependencies:
     uc.micro "^1.0.1"
 
+linkify-it@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz#f55eeb8bc1d3ae754049e124ab3bb56d97797fb8"
+  integrity sha512-gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ==
+  dependencies:
+    uc.micro "^1.0.1"
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -7971,14 +7978,14 @@ markdown-escapes@^1.0.0:
   resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.2.tgz#e639cbde7b99c841c0bacc8a07982873b46d2122"
   integrity sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==
 
-markdown-it@10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc"
-  integrity sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==
+markdown-it@11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-11.0.0.tgz#dbfc30363e43d756ebc52c38586b91b90046b876"
+  integrity sha512-+CvOnmbSubmQFSA9dKz1BRiaSMV7rhexl3sngKqFyXSagoA3fBdJQ8oZWtRy2knXdpDXaBw44euz37DeJQ9asg==
   dependencies:
     argparse "^1.0.7"
     entities "~2.0.0"
-    linkify-it "^2.0.0"
+    linkify-it "^3.0.1"
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
@@ -7998,10 +8005,10 @@ markdown-table@^1.1.0:
   resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.2.tgz#c78db948fa879903a41bce522e3b96f801c63786"
   integrity sha512-NcWuJFHDA8V3wkDgR/j4+gZx+YQwstPgfQDV8ndUeWWzta3dnDTBxpVzqS9lkmJAuV5YX35lmyojl6HO5JXAgw==
 
-markdownlint-cli@0.23.2:
-  version "0.23.2"
-  resolved "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.23.2.tgz#43f0a96e2699542b74fb5e6188c025e4934357fc"
-  integrity sha512-OSl5OZ8xzGN6z355cqRkiq67zPi3reJimklaF72p0554q85Dng5ToOjjSB9tDKZebSt85jX8cp+ruoQlPqOsPA==
+markdownlint-cli@0.24.0:
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.24.0.tgz#d1c1d43cd53b87aaec93035b3234eef7097139a8"
+  integrity sha512-AusUxaX4sFayUBFTCKeHc8+fq73KFqIUW+ZZZYyQ/BvY0MoGAnE2C/3xiawSE7WXmpmguaWzhrXRuY6IrOLX7A==
   dependencies:
     commander "~2.9.0"
     deep-extend "~0.5.1"
@@ -8012,23 +8019,23 @@ markdownlint-cli@0.23.2:
     jsonc-parser "~2.2.0"
     lodash.differencewith "~4.5.0"
     lodash.flatten "~4.4.0"
-    markdownlint "~0.20.4"
-    markdownlint-rule-helpers "~0.11.0"
+    markdownlint "~0.21.0"
+    markdownlint-rule-helpers "~0.12.0"
     minimatch "~3.0.4"
     minimist "~1.2.5"
     rc "~1.2.7"
 
-markdownlint-rule-helpers@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.11.0.tgz#faaaae4337771c7d88ca38ef6265afb4fbe0fb3f"
-  integrity sha512-PhGii9dOiDJDXxiRMpK8N0FM9powprvRPsXALgkjlSPTwLh6ymH+iF3iUe3nq8KGu26tclFBlLL5xAGy/zb7FA==
+markdownlint-rule-helpers@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.12.0.tgz#c41d9b990c50911572e8eb2fba3e6975a5514b7e"
+  integrity sha512-Q7qfAk+AJvx82ZY52OByC4yjoQYryOZt6D8TKrZJIwCfhZvcj8vCQNuwDqILushtDBTvGFmUPq+uhOb1KIMi6A==
 
-markdownlint@~0.20.4:
-  version "0.20.4"
-  resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.20.4.tgz#3b34681494cdad174e14a27182b5cdefaa537823"
-  integrity sha512-jpfaPgjT0OpeBbemjYNZbzGG3hCLcAIvrm/pEY3+q/szDScG6ZonDacqySVRJAv9glbo8y4wBPJ0wgW17+9GGA==
+markdownlint@~0.21.0:
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.21.1.tgz#9442afcf12bf65ce9d613212028cf85741677421"
+  integrity sha512-8kc88w5dyEzlmOWIElp8J17qBgzouOQfJ0LhCcpBFrwgyYK6JTKvILsk4FCEkiNqHkTxwxopT2RS2DYb/10qqg==
   dependencies:
-    markdown-it "10.0.0"
+    markdown-it "11.0.0"
 
 marked@^0.3.12, marked@~0.3.6:
   version "0.3.19"