Merge branch 'renovate/gitlab-uisvg' into 'master'

Update GitLab UI/SVG See merge request gitlab-org/gitlab!46678

Merge branch 'renovate/gitlab-uisvg' into 'master'
Update GitLab UI/SVG See merge request gitlab-org/gitlab!46678
fdef227c · Jose Ivan Vargas · 04028c8e · e286619f · fdef227c · fdef227c
Commit fdef227c authored Nov 03, 2020 by Jose Ivan Vargas
221 changed files
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -676,10 +676,14 @@
 ##################
 .releases:rules:canonical-dot-com-gitlab-stable-branch-only:
  rules:
+    - if: '$CI_COMMIT_MESSAGE =~ /\[merge-train skip\]/'
+      when: never
    - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab" && $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable-ee$/'

 .releases:rules:canonical-dot-com-security-gitlab-stable-branch-only:
  rules:
+    - if: '$CI_COMMIT_MESSAGE =~ /\[merge-train skip\]/'
+      when: never
    - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/security/gitlab" && $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable-ee$/'

 #################

--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -183,19 +183,6 @@ RSpec/ContextWording:
 RSpec/ExpectChange:
  Enabled: false

-# Offense count: 47
-RSpec/ExpectGitlabTracking:
-  Exclude:
-    - 'spec/controllers/projects/registry/repositories_controller_spec.rb'
-    - 'spec/controllers/projects/registry/tags_controller_spec.rb'
-    - 'spec/controllers/projects/settings/operations_controller_spec.rb'
-    - 'spec/lib/api/helpers_spec.rb'
-    - 'spec/requests/api/project_container_repositories_spec.rb'
-    - 'spec/support/shared_examples/controllers/trackable_shared_examples.rb'
-    - 'spec/support/shared_examples/requests/api/discussions_shared_examples.rb'
-    - 'spec/support/shared_examples/requests/api/packages_shared_examples.rb'
-    - 'spec/support/shared_examples/requests/api/tracking_shared_examples.rb'
-
 # Offense count: 751
 RSpec/ExpectInHook:
  Enabled: false

--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
-991ab1619abd34de70388d277892af9ad4c4994c
+940a45ca938b20031820a4976f936a5b6173de92
--- a/app/assets/javascripts/analytics/product_analytics/components/activity_chart.vue
+++ b/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'"

--- a/app/assets/javascripts/design_management/components/design_destroyer.vue
+++ b/app/assets/javascripts/design_management/components/design_destroyer.vue
 <script>
 import { ApolloMutation } from 'vue-apollo';
-import getDesignListQuery from '../graphql/queries/get_design_list.query.graphql';
+import getDesignListQuery from 'shared_queries/design_management/get_design_list.query.graphql';
 import destroyDesignMutation from '../graphql/mutations/destroy_design.mutation.graphql';
 import { updateStoreAfterDesignsDelete } from '../utils/cache_update';


--- a/app/assets/javascripts/design_management/components/toolbar/index.vue
+++ b/app/assets/javascripts/design_management/components/toolbar/index.vue
 <script>
 import { GlButton, GlIcon } from '@gitlab/ui';
+import permissionsQuery from 'shared_queries/design_management/design_permissions.query.graphql';
 import { __, sprintf } from '~/locale';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
 import DesignNavigation from './design_navigation.vue';
 import DeleteButton from '../delete_button.vue';
-import permissionsQuery from '../../graphql/queries/design_permissions.query.graphql';
 import { DESIGNS_ROUTE_NAME } from '../../router/constants';

 export default {

--- a/app/assets/javascripts/design_management/mixins/all_designs.js
+++ b/app/assets/javascripts/design_management/mixins/all_designs.js
 import { propertyOf } from 'lodash';
+import getDesignListQuery from 'shared_queries/design_management/get_design_list.query.graphql';
 import createFlash, { FLASH_TYPES } from '~/flash';
 import { s__ } from '~/locale';
-import getDesignListQuery from '../graphql/queries/get_design_list.query.graphql';
 import allVersionsMixin from './all_versions';
 import { DESIGNS_ROUTE_NAME } from '../router/constants';


--- a/app/assets/javascripts/design_management/mixins/all_versions.js
+++ b/app/assets/javascripts/design_management/mixins/all_versions.js
-import getDesignListQuery from '../graphql/queries/get_design_list.query.graphql';
+import getDesignListQuery from 'shared_queries/design_management/get_design_list.query.graphql';
 import { findVersionId } from '../utils/design_management_utils';

 export default {

--- a/app/assets/javascripts/design_management/pages/index.vue
+++ b/app/assets/javascripts/design_management/pages/index.vue
 <script>
 import { GlLoadingIcon, GlButton, GlAlert } from '@gitlab/ui';
 import VueDraggable from 'vuedraggable';
+import getDesignListQuery from 'shared_queries/design_management/get_design_list.query.graphql';
+import permissionsQuery from 'shared_queries/design_management/design_permissions.query.graphql';
 import createFlash, { FLASH_TYPES } from '~/flash';
 import { s__, sprintf } from '~/locale';
 import { getFilename } from '~/lib/utils/file_upload';
@@ -12,8 +14,6 @@ import DesignVersionDropdown from '../components/upload/design_version_dropdown.
 import DesignDropzone from '../components/upload/design_dropzone.vue';
 import uploadDesignMutation from '../graphql/mutations/upload_design.mutation.graphql';
 import moveDesignMutation from '../graphql/mutations/move_design.mutation.graphql';
-import permissionsQuery from '../graphql/queries/design_permissions.query.graphql';
-import getDesignListQuery from '../graphql/queries/get_design_list.query.graphql';
 import allDesignsMixin from '../mixins/all_designs';
 import {
  UPLOAD_DESIGN_ERROR,

--- a/app/assets/javascripts/groups/components/app.vue
+++ b/app/assets/javascripts/groups/components/app.vue
@@ -3,9 +3,8 @@

 import $ from 'jquery';
 import 'vendor/jquery.scrollTo';
-import { GlLoadingIcon } from '@gitlab/ui';
-import { s__, sprintf } from '~/locale';
-import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
+import { GlLoadingIcon, GlModal } from '@gitlab/ui';
+import { __, s__, sprintf } from '~/locale';
 import { HIDDEN_CLASS } from '~/lib/utils/constants';
 import { getParameterByName } from '~/lib/utils/common_utils';
 import { mergeUrlParams } from '~/lib/utils/url_utility';
@@ -16,8 +15,8 @@ import groupsComponent from './groups.vue';

 export default {
  components: {
-    DeprecatedModal,
    groupsComponent,
+    GlModal,
    GlLoadingIcon,
  },
  props: {
@@ -49,13 +48,30 @@ export default {
      isLoading: true,
      isSearchEmpty: false,
      searchEmptyMessage: '',
-      showModal: false,
-      groupLeaveConfirmationMessage: '',
      targetGroup: null,
      targetParentGroup: null,
    };
  },
  computed: {
+    primaryProps() {
+      return {
+        text: __('Leave group'),
+        attributes: [{ variant: 'warning' }, { category: 'primary' }],
+      };
+    },
+    cancelProps() {
+      return {
+        text: __('Cancel'),
+      };
+    },
+    groupLeaveConfirmationMessage() {
+      if (!this.targetGroup) {
+        return '';
+      }
+      return sprintf(s__('GroupsTree|Are you sure you want to leave the "%{fullName}" group?'), {
+        fullName: this.targetGroup.fullName,
+      });
+    },
    groups() {
      return this.store.getGroups();
    },
@@ -171,27 +187,17 @@ export default {
      }
    },
    showLeaveGroupModal(group, parentGroup) {
-      const { fullName } = group;
      this.targetGroup = group;
      this.targetParentGroup = parentGroup;
-      this.showModal = true;
-      this.groupLeaveConfirmationMessage = sprintf(
-        s__('GroupsTree|Are you sure you want to leave the "%{fullName}" group?'),
-        { fullName },
-      );
-    },
-    hideLeaveGroupModal() {
-      this.showModal = false;
    },
    leaveGroup() {
-      this.showModal = false;
      this.targetGroup.isBeingRemoved = true;
      this.service
        .leaveGroup(this.targetGroup.leavePath)
        .then(res => {
          $.scrollTo(0);
          this.store.removeGroup(this.targetGroup, this.targetParentGroup);
-          Flash(res.data.notice, 'notice');
+          this.$toast.show(res.data.notice);
        })
        .catch(err => {
          let message = COMMON_STR.FAILURE;
@@ -245,21 +251,21 @@ export default {
      class="loading-animation prepend-top-20"
    />
    <groups-component
-      v-if="!isLoading"
+      v-else
      :groups="groups"
      :search-empty="isSearchEmpty"
      :search-empty-message="searchEmptyMessage"
      :page-info="pageInfo"
      :action="action"
    />
-    <deprecated-modal
-      v-show="showModal"
-      :primary-button-label="__('Leave')"
+    <gl-modal
+      modal-id="leave-group-modal"
      :title="__('Are you sure?')"
-      :text="groupLeaveConfirmationMessage"
-      kind="warning"
-      @cancel="hideLeaveGroupModal"
-      @submit="leaveGroup"
-    />
+      :action-primary="primaryProps"
+      :action-cancel="cancelProps"
+      @primary="leaveGroup"
+    >
+      {{ groupLeaveConfirmationMessage }}
+    </gl-modal>
  </div>
 </template>
--- a/app/assets/javascripts/groups/components/item_actions.vue
+++ b/app/assets/javascripts/groups/components/item_actions.vue
 <script>
-import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
+import { GlTooltipDirective, GlButton, GlModalDirective } from '@gitlab/ui';
 import eventHub from '../event_hub';
 import { COMMON_STR } from '../constants';

 export default {
  components: {
-    GlIcon,
+    GlButton,
  },
  directives: {
    GlTooltip: GlTooltipDirective,
+    GlModal: GlModalDirective,
  },
  props: {
    parentGroup: {
@@ -44,28 +45,28 @@ export default {

 <template>
  <div class="controls d-flex justify-content-end">
-    <a
+    <gl-button
      v-if="group.canLeave"
      v-gl-tooltip.top
-      :href="group.leavePath"
+      v-gl-modal.leave-group-modal
      :title="leaveBtnTitle"
      :aria-label="leaveBtnTitle"
      data-testid="leave-group-btn"
-      class="leave-group btn btn-xs no-expand gl-text-gray-500 gl-ml-5"
-      @click.prevent="onLeaveGroup"
-    >
-      <gl-icon name="leave" class="position-top-0" />
-    </a>
-    <a
+      size="small"
+      icon="leave"
+      class="leave-group gl-ml-3"
+      @click.stop="onLeaveGroup"
+    />
+    <gl-button
      v-if="group.canEdit"
      v-gl-tooltip.top
      :href="group.editPath"
      :title="editBtnTitle"
      :aria-label="editBtnTitle"
      data-testid="edit-group-btn"
-      class="edit-group btn btn-xs no-expand gl-text-gray-500 gl-ml-5"
-    >
-      <gl-icon name="settings" class="position-top-0 align-middle" />
-    </a>
+      size="small"
+      icon="pencil"
+      class="edit-group gl-ml-3"
+    />
  </div>
 </template>
--- a/app/assets/javascripts/groups/index.js
+++ b/app/assets/javascripts/groups/index.js
 import Vue from 'vue';
+import { GlToast } from '@gitlab/ui';
 import { parseBoolean } from '~/lib/utils/common_utils';
 import Translate from '../vue_shared/translate';
 import GroupFilterableList from './groups_filterable_list';
@@ -31,6 +32,8 @@ export default (containerId = 'js-groups-tree', endpoint, action = '') => {
  Vue.component('group-folder', groupFolderComponent);
  Vue.component('group-item', groupItemComponent);

+  Vue.use(GlToast);
+
  // eslint-disable-next-line no-new
  new Vue({
    el,

--- a/app/assets/javascripts/issue_show/components/header_actions.vue
+++ b/app/assets/javascripts/issue_show/components/header_actions.vue
+<script>
+import { GlButton, GlDropdown, GlDropdownItem, GlIcon, GlLink, GlModal } from '@gitlab/ui';
+import { mapGetters } from 'vuex';
+import createFlash from '~/flash';
+import { IssuableStatus, IssueStateEvent } from '~/issue_show/constants';
+import { __ } from '~/locale';
+import updateIssueMutation from '../queries/update_issue.mutation.graphql';
+
+export default {
+  components: {
+    GlButton,
+    GlDropdown,
+    GlDropdownItem,
+    GlIcon,
+    GlLink,
+    GlModal,
+  },
+  actionCancel: {
+    text: __('Cancel'),
+  },
+  actionPrimary: {
+    text: __('Yes, close issue'),
+    attributes: [{ variant: 'warning' }],
+  },
+  inject: [
+    'canCreateIssue',
+    'canReopenIssue',
+    'canReportSpam',
+    'canUpdateIssue',
+    'iid',
+    'isIssueAuthor',
+    'newIssuePath',
+    'projectPath',
+    'reportAbusePath',
+    'submitAsSpamPath',
+  ],
+  data() {
+    return {
+      isUpdatingState: false,
+    };
+  },
+  computed: {
+    ...mapGetters(['getNoteableData']),
+    isClosed() {
+      return this.getNoteableData.state === IssuableStatus.Closed;
+    },
+    buttonText() {
+      return this.isClosed ? __('Reopen issue') : __('Close issue');
+    },
+    buttonVariant() {
+      return this.isClosed ? 'default' : 'warning';
+    },
+    showToggleIssueButton() {
+      const canClose = !this.isClosed && this.canUpdateIssue;
+      const canReopen = this.isClosed && this.canReopenIssue;
+      return canClose || canReopen;
+    },
+  },
+  methods: {
+    toggleIssueState() {
+      if (!this.isClosed && this.getNoteableData?.blocked_by_issues?.length) {
+        this.$refs.blockedByIssuesModal.show();
+        return;
+      }
+
+      this.invokeUpdateIssueMutation();
+    },
+    invokeUpdateIssueMutation() {
+      this.isUpdatingState = true;
+
+      this.$apollo
+        .mutate({
+          mutation: updateIssueMutation,
+          variables: {
+            input: {
+              iid: this.iid.toString(),
+              projectPath: this.projectPath,
+              stateEvent: this.isClosed ? IssueStateEvent.Reopen : IssueStateEvent.Close,
+            },
+          },
+        })
+        .then(({ data }) => {
+          if (data.updateIssue.errors.length) {
+            createFlash(data.updateIssue.errors.join('. '));
+            return;
+          }
+
+          const payload = {
+            detail: {
+              data: { id: this.iid },
+              isClosed: !this.isClosed,
+            },
+          };
+
+          // Dispatch event which updates open/close state, shared among the issue show page
+          document.dispatchEvent(new CustomEvent('issuable_vue_app:change', payload));
+        })
+        .catch(() => createFlash(__('Update failed. Please try again.')))
+        .finally(() => {
+          this.isUpdatingState = false;
+        });
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="detail-page-header-actions">
+    <gl-dropdown class="gl-display-block gl-display-sm-none!" block :text="__('Issue actions')">
+      <gl-dropdown-item
+        v-if="showToggleIssueButton"
+        :disabled="isUpdatingState"
+        @click="toggleIssueState"
+      >
+        {{ buttonText }}
+      </gl-dropdown-item>
+      <gl-dropdown-item v-if="canCreateIssue" :href="newIssuePath">
+        {{ __('New issue') }}
+      </gl-dropdown-item>
+      <gl-dropdown-item v-if="!isIssueAuthor" :href="reportAbusePath">
+        {{ __('Report abuse') }}
+      </gl-dropdown-item>
+      <gl-dropdown-item
+        v-if="canReportSpam"
+        :href="submitAsSpamPath"
+        data-method="post"
+        rel="nofollow"
+      >
+        {{ __('Submit as spam') }}
+      </gl-dropdown-item>
+    </gl-dropdown>
+
+    <gl-button
+      v-if="showToggleIssueButton"
+      class="gl-display-none gl-display-sm-inline-flex!"
+      category="secondary"
+      :loading="isUpdatingState"
+      :variant="buttonVariant"
+      @click="toggleIssueState"
+    >
+      {{ buttonText }}
+    </gl-button>
+
+    <gl-dropdown
+      class="gl-display-none gl-display-sm-inline-flex!"
+      toggle-class="gl-border-0! gl-shadow-none!"
+      no-caret
+      right
+    >
+      <template #button-content>
+        <gl-icon name="ellipsis_v" aria-hidden="true" />
+        <span class="gl-sr-only">{{ __('Actions') }}</span>
+      </template>
+
+      <gl-dropdown-item v-if="canCreateIssue" :href="newIssuePath">
+        {{ __('New issue') }}
+      </gl-dropdown-item>
+      <gl-dropdown-item v-if="!isIssueAuthor" :href="reportAbusePath">
+        {{ __('Report abuse') }}
+      </gl-dropdown-item>
+      <gl-dropdown-item
+        v-if="canReportSpam"
+        :href="submitAsSpamPath"
+        data-method="post"
+        rel="nofollow"
+      >
+        {{ __('Submit as spam') }}
+      </gl-dropdown-item>
+    </gl-dropdown>
+
+    <gl-modal
+      ref="blockedByIssuesModal"
+      modal-id="blocked-by-issues-modal"
+      :action-cancel="$options.actionCancel"
+      :action-primary="$options.actionPrimary"
+      :title="__('Are you sure you want to close this blocked issue?')"
+      @primary="invokeUpdateIssueMutation"
+    >
+      <p>{{ __('This issue is currently blocked by the following issues:') }}</p>
+      <ul>
+        <li v-for="issue in getNoteableData.blocked_by_issues" :key="issue.iid">
+          <gl-link :href="issue.web_url">#{{ issue.iid }}</gl-link>
+        </li>
+      </ul>
+    </gl-modal>
+  </div>
+</template>
--- a/app/assets/javascripts/issue_show/constants.js
+++ b/app/assets/javascripts/issue_show/constants.js
@@ -18,5 +18,10 @@ export const IssuableType = {
  MergeRequest: 'merge_request',
 };

+export const IssueStateEvent = {
+  Close: 'CLOSE',
+  Reopen: 'REOPEN',
+};
+
 export const STATUS_PAGE_PUBLISHED = __('Published on status page');
 export const JOIN_ZOOM_MEETING = __('Join Zoom meeting');
--- a/app/assets/javascripts/issue_show/issue.js
+++ b/app/assets/javascripts/issue_show/issue.js
 import Vue from 'vue';
+import VueApollo from 'vue-apollo';
 import { mapGetters } from 'vuex';
+import createDefaultClient from '~/lib/graphql';
+import { parseBoolean } from '~/lib/utils/common_utils';
 import IssuableApp from './components/app.vue';
+import HeaderActions from './components/header_actions.vue';

-export default function initIssuableApp(issuableData, store) {
+export function initIssuableApp(issuableData, store) {
  return new Vue({
    el: document.getElementById('js-issuable-app'),
    store,
@@ -19,3 +23,36 @@ export default function initIssuableApp(issuableData, store) {
    },
  });
 }
+
+export function initIssueHeaderActions(store) {
+  const el = document.querySelector('.js-issue-header-actions');
+
+  if (!el) {
+    return undefined;
+  }
+
+  Vue.use(VueApollo);
+
+  const apolloProvider = new VueApollo({
+    defaultClient: createDefaultClient(),
+  });
+
+  return new Vue({
+    el,
+    apolloProvider,
+    store,
+    provide: {
+      canCreateIssue: parseBoolean(el.dataset.canCreateIssue),
+      canReopenIssue: parseBoolean(el.dataset.canReopenIssue),
+      canReportSpam: parseBoolean(el.dataset.canReportSpam),
+      canUpdateIssue: parseBoolean(el.dataset.canUpdateIssue),
+      iid: el.dataset.iid,
+      isIssueAuthor: parseBoolean(el.dataset.isIssueAuthor),
+      newIssuePath: el.dataset.newIssuePath,
+      projectPath: el.dataset.projectPath,
+      reportAbusePath: el.dataset.reportAbusePath,
+      submitAsSpamPath: el.dataset.submitAsSpamPath,
+    },
+    render: createElement => createElement(HeaderActions),
+  });
+}
--- a/app/assets/javascripts/issue_show/queries/update_issue.mutation.graphql
+++ b/app/assets/javascripts/issue_show/queries/update_issue.mutation.graphql
+mutation updateIssue($input: UpdateIssueInput!) {
+  updateIssue(input: $input) {
+    errors
+  }
+}
--- a/app/assets/javascripts/monitoring/components/charts/column.vue
+++ b/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"

--- a/app/assets/javascripts/monitoring/components/charts/stacked_column.vue
+++ b/app/assets/javascripts/monitoring/components/charts/stacked_column.vue
@@ -61,14 +61,16 @@ export default {
  },
  computed: {
    chartData() {
-      return this.graphData.metrics.map(({ result }) => {
+      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 result[0].values.map(val => val[1]);
-      });
+          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"

--- a/app/assets/javascripts/pages/projects/graphs/charts/index.js
+++ b/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',

--- a/app/assets/javascripts/pages/projects/issues/show.js
+++ b/app/assets/javascripts/pages/projects/issues/show.js
@@ -5,7 +5,7 @@ import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable';
 import ZenMode from '~/zen_mode';
 import '~/notes/index';
 import { store } from '~/notes/stores';
-import initIssueApp from '~/issue_show/issue';
+import { initIssuableApp, initIssueHeaderActions } from '~/issue_show/issue';
 import initIncidentApp from '~/issue_show/incident';
 import initIssuableHeaderWarning from '~/vue_shared/components/issuable/init_issuable_header_warning';
 import initSentryErrorStackTraceApp from '~/sentry_error_stack_trace';
@@ -24,13 +24,14 @@ export default function() {
      initIncidentApp(issuableData);
      break;
    case IssuableType.Issue:
-      initIssueApp(issuableData, store);
+      initIssuableApp(issuableData, store);
      break;
    default:
      break;
  }

  initIssuableHeaderWarning(store);
+  initIssueHeaderActions(store);
  initSentryErrorStackTraceApp();
  initRelatedMergeRequestsApp();


--- a/app/assets/javascripts/pipeline_editor/components/text_editor.vue
+++ b/app/assets/javascripts/pipeline_editor/components/text_editor.vue
@@ -16,6 +16,11 @@ export default {
 </script>
 <template>
  <div class="gl-border-solid gl-border-gray-100 gl-border-1">
-    <editor-lite v-model="value" file-name="*.yml" :editor-options="{ readOnly: true }" />
+    <editor-lite
+      v-model="value"
+      file-name="*.yml"
+      :editor-options="{ readOnly: true }"
+      @editor-ready="$emit('editor-ready')"
+    />
  </div>
 </template>
--- a/app/assets/javascripts/pipeline_editor/pipeline_editor_app.vue
+++ b/app/assets/javascripts/pipeline_editor/pipeline_editor_app.vue
 <script>
-import { GlLoadingIcon, GlAlert } from '@gitlab/ui';
+import { GlLoadingIcon, GlAlert, GlTabs, GlTab } from '@gitlab/ui';
 import { __, s__, sprintf } from '~/locale';

 import TextEditor from './components/text_editor.vue';
+import PipelineGraph from '~/pipelines/components/pipeline_graph/pipeline_graph.vue';

 import getBlobContent from './graphql/queries/blob_content.graphql';

@@ -10,7 +11,10 @@ export default {
  components: {
    GlLoadingIcon,
    GlAlert,
+    GlTabs,
+    GlTab,
    TextEditor,
+    PipelineGraph,
  },
  props: {
    projectPath: {
@@ -31,6 +35,7 @@ export default {
    return {
      error: null,
      content: '',
+      editorIsReady: false,
    };
  },
  apollo: {
@@ -66,10 +71,16 @@ export default {
      const reason = networkReason ?? generalReason ?? this.$options.i18n.unknownError;
      return sprintf(this.$options.i18n.errorMessageWithReason, { reason });
    },
+    pipelineData() {
+      // Note data will loaded as part of https://gitlab.com/gitlab-org/gitlab/-/issues/263141
+      return {};
+    },
  },
  i18n: {
    unknownError: __('Unknown Error'),
    errorMessageWithReason: s__('Pipelines|CI file could not be loaded: %{reason}'),
+    tabEdit: s__('Pipelines|Write pipeline configuration'),
+    tabGraph: s__('Pipelines|Visualize'),
  },
 };
 </script>
@@ -79,7 +90,19 @@ export default {
    <gl-alert v-if="error" :dismissible="false" variant="danger">{{ errorMessage }}</gl-alert>
    <div class="gl-mt-4">
      <gl-loading-icon v-if="loading" size="lg" />
-      <text-editor v-else v-model="content" />
+      <div v-else class="file-editor">
+        <gl-tabs>
+          <!-- editor should be mounted when its tab is visible, so the container has a size -->
+          <gl-tab :title="$options.i18n.tabEdit" :lazy="!editorIsReady">
+            <!-- editor should be mounted only once, when the tab is displayed -->
+            <text-editor v-model="content" @editor-ready="editorIsReady = true" />
+          </gl-tab>
+
+          <gl-tab :title="$options.i18n.tabGraph">
+            <pipeline-graph :pipeline-data="pipelineData" />
+          </gl-tab>
+        </gl-tabs>
+      </div>
    </div>
  </div>
 </template>
--- a/app/assets/javascripts/projects/pipelines/charts/components/app.vue
+++ b/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"

--- a/app/assets/javascripts/snippets/components/edit.vue
+++ b/app/assets/javascripts/snippets/components/edit.vue
@@ -16,12 +16,7 @@ import { performanceMarkAndMeasure } from '~/performance_utils';
 import UpdateSnippetMutation from '../mutations/updateSnippet.mutation.graphql';
 import CreateSnippetMutation from '../mutations/createSnippet.mutation.graphql';
 import { getSnippetMixin } from '../mixins/snippets';
-import {
-  SNIPPET_CREATE_MUTATION_ERROR,
-  SNIPPET_UPDATE_MUTATION_ERROR,
-  SNIPPET_VISIBILITY_PRIVATE,
-} from '../constants';
-import defaultVisibilityQuery from '../queries/snippet_visibility.query.graphql';
+import { SNIPPET_CREATE_MUTATION_ERROR, SNIPPET_UPDATE_MUTATION_ERROR } from '../constants';
 import { markBlobPerformance } from '../utils/blob';

 import SnippetBlobActionsEdit from './snippet_blob_actions_edit.vue';
@@ -41,15 +36,7 @@ export default {
    GlLoadingIcon,
  },
  mixins: [getSnippetMixin],
-  apollo: {
-    defaultVisibility: {
-      query: defaultVisibilityQuery,
-      manual: true,
-      result({ data: { selectedLevel } }) {
-        this.selectedLevelDefault = selectedLevel;
-      },
-    },
-  },
+  inject: ['selectedLevel'],
  props: {
    markdownPreviewPath: {
      type: String,
@@ -73,9 +60,12 @@ export default {
  data() {
    return {
      isUpdating: false,
-      newSnippet: false,
      actions: [],
-      selectedLevelDefault: SNIPPET_VISIBILITY_PRIVATE,
+      snippet: {
+        title: '',
+        description: '',
+        visibilityLevel: this.selectedLevel,
+      },
    };
  },
  computed: {
@@ -112,13 +102,6 @@ export default {
      }
      return this.snippet.webUrl;
    },
-    newSnippetSchema() {
-      return {
-        title: '',
-        description: '',
-        visibilityLevel: this.selectedLevelDefault,
-      };
-    },
  },
  beforeCreate() {
    performanceMarkAndMeasure({ mark: SNIPPET_MARK_EDIT_APP_START });
@@ -145,20 +128,6 @@ export default {
      Flash(sprintf(defaultErrorMsg, { err }));
      this.isUpdating = false;
    },
-    onNewSnippetFetched() {
-      this.newSnippet = true;
-      this.snippet = this.newSnippetSchema;
-    },
-    onExistingSnippetFetched() {
-      this.newSnippet = false;
-    },
-    onSnippetFetch(snippetRes) {
-      if (snippetRes.data.snippets.nodes.length === 0) {
-        this.onNewSnippetFetched();
-      } else {
-        this.onExistingSnippetFetched();
-      }
-    },
    getAttachedFiles() {
      const fileInputs = Array.from(this.$el.querySelectorAll('[name="files[]"]'));
      return fileInputs.map(node => node.value);
@@ -209,7 +178,7 @@ export default {
 </script>
 <template>
  <form
-    class="snippet-form js-requires-input js-quick-submit common-note-form"
+    class="snippet-form js-quick-submit common-note-form"
    :data-snippet-type="isProjectSnippet ? 'project' : 'personal'"
    data-testid="snippet-edit-form"
    @submit.prevent="handleFormSubmit"

--- a/app/assets/javascripts/snippets/components/snippet_visibility_edit.vue
+++ b/app/assets/javascripts/snippets/components/snippet_visibility_edit.vue
 <script>
 import { GlIcon, GlFormGroup, GlFormRadio, GlFormRadioGroup, GlLink } from '@gitlab/ui';
-import defaultVisibilityQuery from '../queries/snippet_visibility.query.graphql';
 import { defaultSnippetVisibilityLevels } from '../utils/blob';
 import { SNIPPET_LEVELS_RESTRICTED, SNIPPET_LEVELS_DISABLED } from '~/snippets/constants';

@@ -12,16 +11,7 @@ export default {
    GlFormRadioGroup,
    GlLink,
  },
-  apollo: {
-    defaultVisibility: {
-      query: defaultVisibilityQuery,
-      manual: true,
-      result({ data: { visibilityLevels, multipleLevelsRestricted } }) {
-        this.visibilityLevels = defaultSnippetVisibilityLevels(visibilityLevels);
-        this.multipleLevelsRestricted = multipleLevelsRestricted;
-      },
-    },
-  },
+  inject: ['visibilityLevels', 'multipleLevelsRestricted'],
  props: {
    helpLink: {
      type: String,
@@ -38,11 +28,10 @@ export default {
      required: true,
    },
  },
-  data() {
-    return {
-      visibilityLevels: [],
-      multipleLevelsRestricted: false,
-    };
+  computed: {
+    defaultVisibilityLevels() {
+      return defaultSnippetVisibilityLevels(this.visibilityLevels);
+    },
  },
  SNIPPET_LEVELS_DISABLED,
  SNIPPET_LEVELS_RESTRICTED,
@@ -59,7 +48,7 @@ export default {
    <gl-form-group id="visibility-level-setting" class="gl-mb-0">
      <gl-form-radio-group :checked="value" stacked v-bind="$attrs" v-on="$listeners">
        <gl-form-radio
-          v-for="option in visibilityLevels"
+          v-for="option in defaultVisibilityLevels"
          :key="option.value"
          :value="option.value"
          class="mb-3"
@@ -78,7 +67,9 @@ export default {
    </gl-form-group>

    <div class="text-muted" data-testid="restricted-levels-info">
-      <template v-if="!visibilityLevels.length">{{ $options.SNIPPET_LEVELS_DISABLED }}</template>
+      <template v-if="!defaultVisibilityLevels.length">{{
+        $options.SNIPPET_LEVELS_DISABLED
+      }}</template>
      <template v-else-if="multipleLevelsRestricted">{{
        $options.SNIPPET_LEVELS_RESTRICTED
      }}</template>

--- a/app/assets/javascripts/snippets/index.js
+++ b/app/assets/javascripts/snippets/index.js
@@ -24,17 +24,14 @@ export default function appFactory(el, Component) {
    ...restDataset
  } = el.dataset;

-  apolloProvider.clients.defaultClient.cache.writeData({
-    data: {
+  return new Vue({
+    el,
+    apolloProvider,
+    provide: {
      visibilityLevels: JSON.parse(visibilityLevels),
      selectedLevel: SNIPPET_LEVELS_MAP[selectedLevel] ?? SNIPPET_VISIBILITY_PRIVATE,
      multipleLevelsRestricted: 'multipleLevelsRestricted' in el.dataset,
    },
-  });
-
-  return new Vue({
-    el,
-    apolloProvider,
    render(createElement) {
      return createElement(Component, {
        props: {

--- a/app/assets/javascripts/snippets/mixins/snippets.js
+++ b/app/assets/javascripts/snippets/mixins/snippets.js
@@ -21,9 +21,9 @@ export const getSnippetMixin = {
      },
      result(res) {
        this.blobs = res.data.snippets.nodes[0]?.blobs || blobsDefault;
-        if (this.onSnippetFetch) {
-          this.onSnippetFetch(res);
-        }
+      },
+      skip() {
+        return this.newSnippet;
      },
    },
  },
@@ -36,7 +36,7 @@ export const getSnippetMixin = {
  data() {
    return {
      snippet: {},
-      newSnippet: false,
+      newSnippet: !this.snippetGid,
      blobs: blobsDefault,
    };
  },

--- a/app/assets/javascripts/snippets/queries/snippet_visibility.query.graphql
+++ b/app/assets/javascripts/snippets/queries/snippet_visibility.query.graphql
-query defaultSnippetVisibility {
-  visibilityLevels @client
-  selectedLevel @client
-  multipleLevelsRestricted @client
-}
--- a/app/assets/javascripts/vue_shared/components/members/constants.js
+++ b/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',
  },
 ];


--- a/app/assets/javascripts/vue_shared/components/members/table/members_table.vue
+++ b/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>


--- a/app/assets/javascripts/vue_shared/components/members/table/members_table_cell.vue
+++ b/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() {

--- a/app/assets/javascripts/vue_shared/components/members/utils.js
+++ b/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;
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -44,6 +44,7 @@ class Projects::IssuesController < Projects::ApplicationController
    push_frontend_feature_flag(:vue_issuable_sidebar, project.group)
    push_frontend_feature_flag(:tribute_autocomplete, @project)
    push_frontend_feature_flag(:vue_issuables_list, project)
+    push_frontend_feature_flag(:vue_issue_header, @project)
  end

  before_action only: :show do

--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/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


--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@@ -75,7 +75,7 @@ module Projects
        [
          :runners_token, :builds_enabled, :build_allow_git_fetch,
          :build_timeout_human_readable, :build_coverage_regex, :public_builds,
-          :auto_cancel_pending_pipelines, :ci_config_path,
+          :auto_cancel_pending_pipelines, :ci_config_path, :auto_rollback_enabled,
          auto_devops_attributes: [:id, :domain, :enabled, :deploy_strategy],
          ci_cd_settings_attributes: [:default_git_depth, :forward_deployment_enabled]
        ].tap do |list|

--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/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)

--- a/app/graphql/mutations/alert_management/http_integration/destroy.rb
+++ b/app/graphql/mutations/alert_management/http_integration/destroy.rb
+# frozen_string_literal: true
+
+module Mutations
+  module AlertManagement
+    module HttpIntegration
+      class Destroy < HttpIntegrationBase
+        graphql_name 'HttpIntegrationDestroy'
+
+        argument :id, Types::GlobalIDType[::AlertManagement::HttpIntegration],
+                 required: true,
+                 description: "The id of the integration to remove"
+
+        def resolve(id:)
+          integration = authorized_find!(id: id)
+
+          response ::AlertManagement::HttpIntegrations::DestroyService.new(
+            integration,
+            current_user
+          ).execute
+        end
+      end
+    end
+  end
+end
--- a/app/graphql/mutations/alert_management/http_integration/http_integration_base.rb
+++ b/app/graphql/mutations/alert_management/http_integration/http_integration_base.rb
@@ -7,7 +7,7 @@ module Mutations
        field :integration,
              Types::AlertManagement::HttpIntegrationType,
              null: true,
-              description: "The updated HTTP integration"
+              description: "The HTTP integration"

        authorize :admin_operations


--- a/app/assets/javascripts/design_management/graphql/queries/design_permissions.query.graphql
+++ b/app/assets/javascripts/design_management/graphql/queries/design_permissions.query.graphql
 query permissions($fullPath: ID!, $iid: String!) {
  project(fullPath: $fullPath) {
+    __typename
    id
    issue(iid: $iid) {
+      __typename
      userPermissions {
+        __typename
        createDesign
      }
    }

--- a/app/assets/javascripts/design_management/graphql/queries/get_design_list.query.graphql
+++ b/app/assets/javascripts/design_management/graphql/queries/get_design_list.query.graphql
-#import "../fragments/design_list.fragment.graphql"
-#import "../fragments/version.fragment.graphql"
-
 query getDesignList($fullPath: ID!, $iid: String!, $atVersion: ID) {
  project(fullPath: $fullPath) {
+    __typename
    id
    issue(iid: $iid) {
+      __typename
      designCollection {
+        __typename
        copyState
        designs(atVersion: $atVersion) {
+          __typename
          nodes {
-            ...DesignListItem
+            __typename
+            id
+            event
+            filename
+            notesCount
+            image
+            imageV432x230
+            currentUserTodos(state: pending) {
+              __typename
+              nodes {
+                __typename
+                id
+              }
+            }
          }
        }
        versions {
+          __typename
          nodes {
-            ...VersionListItem
+            __typename
+            id
+            sha
          }
        }
      }

--- a/app/graphql/resolvers/admin/analytics/instance_statistics/measurements_resolver.rb
+++ b/app/graphql/resolvers/admin/analytics/instance_statistics/measurements_resolver.rb
@@ -13,10 +13,20 @@ module Resolvers
                    required: true,
                    description: 'The type of measurement/statistics to retrieve'

-          def resolve(identifier:)
+          argument :recorded_after, Types::TimeType,
+                    required: false,
+                    description: 'Measurement recorded after this date'
+
+          argument :recorded_before, Types::TimeType,
+                    required: false,
+                    description: 'Measurement recorded before this date'
+
+          def resolve(identifier:, recorded_before: nil, recorded_after: nil)
            authorize!

            ::Analytics::InstanceStatistics::Measurement
+              .recorded_after(recorded_after)
+              .recorded_before(recorded_before)
              .with_identifier(identifier)
              .order_by_latest
          end

--- a/app/graphql/resolvers/project_pipelines_resolver.rb
+++ b/app/graphql/resolvers/project_pipelines_resolver.rb
@@ -15,7 +15,9 @@ module Resolvers

    def preloads
      {
-        jobs: [:statuses]
+        jobs: [:statuses],
+        upstream: [:triggered_by_pipeline],
+        downstream: [:triggered_pipelines]
      }
    end
  end

--- a/app/graphql/resolvers/users_resolver.rb
+++ b/app/graphql/resolvers/users_resolver.rb
@@ -18,10 +18,14 @@ module Resolvers
             required: false,
             default_value: 'created_desc'

-    def resolve(ids: nil, usernames: nil, sort: nil)
+    argument :search, GraphQL::STRING_TYPE,
+             required: false,
+             description: "Query to search users by name, username, or primary email."
+
+    def resolve(ids: nil, usernames: nil, sort: nil, search: nil)
      authorize!

-      ::UsersFinder.new(context[:current_user], finder_params(ids, usernames, sort)).execute
+      ::UsersFinder.new(context[:current_user], finder_params(ids, usernames, sort, search)).execute
    end

    def ready?(**args)
@@ -42,11 +46,12 @@ module Resolvers

    private

-    def finder_params(ids, usernames, sort)
+    def finder_params(ids, usernames, sort, search)
      params = {}
      params[:sort] = sort if sort
      params[:username] = usernames if usernames
      params[:id] = parse_gids(ids) if ids
+      params[:search] = search if search
      params
    end


--- a/app/graphql/types/ci/pipeline_type.rb
+++ b/app/graphql/types/ci/pipeline_type.rb
@@ -56,12 +56,24 @@ module Types
            description: 'Specifies if a pipeline can be canceled',
            method: :cancelable?,
            null: false
-
      field :jobs,
            ::Types::Ci::JobType.connection_type,
            null: true,
            description: 'Jobs belonging to the pipeline',
            method: :statuses
+      field :source_job, Types::Ci::JobType, null: true,
+            description: 'Job where pipeline was triggered from'
+      field :downstream, Types::Ci::PipelineType.connection_type, null: true,
+            description: 'Pipelines this pipeline will trigger',
+            method: :triggered_pipelines_with_preloads
+      field :upstream, Types::Ci::PipelineType, null: true,
+            description: 'Pipeline that triggered the pipeline',
+            method: :triggered_by_pipeline
+      field :path, GraphQL::STRING_TYPE, null: true,
+            description: "Relative path to the pipeline's page",
+            resolve: -> (obj, _args, _ctx) { ::Gitlab::Routing.url_helpers.project_pipeline_path(obj.project, obj) }
+      field :project, Types::ProjectType, null: true,
+            description: 'Project the pipeline belongs to'
    end
  end
 end

--- a/app/graphql/types/merge_request_type.rb
+++ b/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,

--- a/app/graphql/types/mutation_type.rb
+++ b/app/graphql/types/mutation_type.rb
@@ -14,6 +14,7 @@ module Types
    mount_mutation Mutations::AlertManagement::HttpIntegration::Create
    mount_mutation Mutations::AlertManagement::HttpIntegration::Update
    mount_mutation Mutations::AlertManagement::HttpIntegration::ResetToken
+    mount_mutation Mutations::AlertManagement::HttpIntegration::Destroy
    mount_mutation Mutations::AlertManagement::PrometheusIntegration::Create
    mount_mutation Mutations::AlertManagement::PrometheusIntegration::Update
    mount_mutation Mutations::AlertManagement::PrometheusIntegration::ResetToken

--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -152,6 +152,21 @@ module IssuesHelper
      sort: 'desc'
    }
  end
+
+  def issue_header_actions_data(project, issue, current_user)
+    {
+      can_create_issue: show_new_issue_link?(project).to_s,
+      can_reopen_issue: can?(current_user, :reopen_issue, issue).to_s,
+      can_report_spam: issue.submittable_as_spam_by?(current_user).to_s,
+      can_update_issue: can?(current_user, :update_issue, issue).to_s,
+      iid: issue.iid,
+      is_issue_author: issue.author == current_user,
+      new_issue_path: new_project_issue_path(project),
+      project_path: project.full_path,
+      report_abuse_path: new_abuse_report_path(user_id: issue.author.id, ref_url: issue_url(issue)),
+      submit_as_spam_path: mark_as_spam_project_issue_path(project, issue)
+    }
+  end
 end

 IssuesHelper.prepend_if_ee('EE::IssuesHelper')
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -92,11 +92,27 @@ module SearchHelper
    end
  end

-  def search_entries_empty_message(scope, term)
-    (s_("SearchResults|We couldn't find any %{scope} matching %{term}") % {
+  def search_entries_empty_message(scope, term, group, project)
+    options = {
      scope: search_entries_scope_label(scope, 0),
-      term: "<code>#{h(term)}</code>"
-    }).html_safe
+      term: "<code>#{h(term)}</code>".html_safe
+    }
+
+    # We check project first because we have 3 possible combinations here:
+    # - group && project
+    # - group
+    # - group: nil, project: nil
+    if project
+      html_escape(_("We couldn't find any %{scope} matching %{term} in project %{project}")) % options.merge(
+        project: link_to(project.full_name, project_path(project), target: '_blank', rel: 'noopener noreferrer').html_safe
+      )
+    elsif group
+      html_escape(_("We couldn't find any %{scope} matching %{term} in group %{group}")) % options.merge(
+        group: link_to(group.full_name, group_path(group), target: '_blank', rel: 'noopener noreferrer').html_safe
+      )
+    else
+      html_escape(_("We couldn't find any %{scope} matching %{term}")) % options
+    end
  end

  def repository_ref(project)

--- a/app/mailers/emails/projects.rb
+++ b/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))

--- a/app/models/analytics/instance_statistics/measurement.rb
+++ b/app/models/analytics/instance_statistics/measurement.rb
@@ -36,6 +36,8 @@ module Analytics

      scope :order_by_latest, -> { order(recorded_at: :desc) }
      scope :with_identifier, -> (identifier) { where(identifier: identifier) }
+      scope :recorded_after, -> (date) { where(self.model.arel_table[:recorded_at].gteq(date)) if date.present? }
+      scope :recorded_before, -> (date) { where(self.model.arel_table[:recorded_at].lteq(date)) if date.present? }

      def self.measurement_identifier_values
        identifiers.values

--- a/app/services/alert_management/http_integrations/destroy_service.rb
+++ b/app/services/alert_management/http_integrations/destroy_service.rb
+# frozen_string_literal: true
+
+module AlertManagement
+  module HttpIntegrations
+    class DestroyService
+      # @param integration [AlertManagement::HttpIntegration]
+      # @param current_user [User]
+      def initialize(integration, current_user)
+        @integration = integration
+        @current_user = current_user
+      end
+
+      def execute
+        return error_no_permissions unless allowed?
+        return error_multiple_integrations unless Feature.enabled?(:multiple_http_integrations, integration.project)
+
+        if integration.destroy
+          success
+        else
+          error(integration.errors.full_messages.to_sentence)
+        end
+      end
+
+      private
+
+      attr_reader :integration, :current_user
+
+      def allowed?
+        current_user&.can?(:admin_operations, integration)
+      end
+
+      def error(message)
+        ServiceResponse.error(message: message)
+      end
+
+      def success
+        ServiceResponse.success(payload: { integration: integration })
+      end
+
+      def error_no_permissions
+        error(_('You have insufficient permissions to remove this HTTP integration'))
+      end
+
+      def error_multiple_integrations
+        error(_('Removing integrations is not supported for this project'))
+      end
+    end
+  end
+end
--- a/app/services/alert_management/process_prometheus_alert_service.rb
+++ b/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

--- a/app/services/notification_service.rb
+++ b/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


--- a/app/services/projects/alerting/notify_service.rb
+++ b/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

--- a/app/services/projects/cleanup_service.rb
+++ b/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

--- a/app/services/projects/prometheus/alerts/notify_service.rb
+++ b/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

--- a/app/views/admin/application_settings/_signin.html.haml
+++ b/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"
--- a/app/views/notify/prometheus_alert_fired_email.html.haml
+++ b/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

--- a/app/views/notify/prometheus_alert_fired_email.text.erb
+++ b/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 %>

--- a/app/views/projects/issues/_design_management.html.haml
+++ b/app/views/projects/issues/_design_management.html.haml
@@ -6,6 +6,8 @@
 - enable_lfs_message = s_("DesignManagement|To upload designs, you'll need to enable LFS and have admin enable hashed storage. %{requirements_link_start}More information%{requirements_link_end}").html_safe % { requirements_link_start: requirements_link_start, requirements_link_end: link_end }

 - if @project.design_management_enabled?
+  - add_page_startup_graphql_call('design_management/get_design_list', { fullPath: @project.full_path, iid: @issue.iid.to_s, atVersion: nil })
+  - add_page_startup_graphql_call('design_management/design_permissions', { fullPath: @project.full_path, iid: @issue.iid.to_s })
  .js-design-management{ data: { project_path: @project.full_path, issue_iid: @issue.iid, issue_path: project_issue_path(@project, @issue) } }
 - else
  .gl-border-solid.gl-border-1.gl-border-gray-100.gl-rounded-base.gl-mt-5.gl-p-3.gl-text-center

--- a/app/views/projects/merge_requests/_nav_btns.html.haml
+++ b/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'
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -75,6 +75,8 @@
    .settings-content
      = render 'projects/registry/settings/index'

+= render_if_exists 'projects/settings/ci_cd/auto_rollback', expanded: expanded
+
 - if can?(current_user, :create_freeze_period, @project)
  %section.settings.no-animate#js-deploy-freeze-settings{ class: ('expanded' if expanded) }
    .settings-header

--- a/app/views/search/results/_empty.html.haml
+++ b/app/views/search/results/_empty.html.haml
-.search_box
+.search_box.gl-my-8
  .search_glyph
  %h4
    = sprite_icon('search', size: 24, css_class: 'gl-vertical-align-text-bottom')
-    = search_entries_empty_message(@scope, @search_term)
+    = search_entries_empty_message(@scope, @search_term, @group, @project)
--- a/app/views/shared/issue_type/_details_header.html.haml
+++ b/app/views/shared/issue_type/_details_header.html.haml
@@ -23,6 +23,9 @@
    %a.btn.gl-button.btn-default.float-right.gl-display-block.d-sm-none.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle{ href: "#" }
      = sprite_icon('chevron-double-lg-left')

+  - if Feature.enabled?(:vue_issue_header, @project)
+    .js-issue-header-actions{ data: issue_header_actions_data(@project, @issue, current_user) }
+  - else
    .detail-page-header-actions.js-issuable-actions.js-issuable-buttons{ data: { "action": "close-reopen" } }
      .clearfix.issue-btn-group.dropdown
        %button.btn.gl-button.btn-default.float-left.d-md-none.d-lg-none.d-xl-none{ type: "button", data: { toggle: "dropdown" } }

--- a/app/workers/repository_cleanup_worker.rb
+++ b/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


--- a/changelogs/unreleased/220104-read-only-repository-cleanup.yml
+++ b/changelogs/unreleased/220104-read-only-repository-cleanup.yml
+---
+title: Make the repository read-only while running cleanup
+merge_request: 45058
+author:
+type: changed
--- a/changelogs/unreleased/229685-update-leave-group-modal.yml
+++ b/changelogs/unreleased/229685-update-leave-group-modal.yml
+---
+title: Update leave group modal to gl-modal
+merge_request: 41817
+author:
+type: changed
--- a/changelogs/unreleased/263109-implement-graphql-startup-js-for-design-management-app.yml
+++ b/changelogs/unreleased/263109-implement-graphql-startup-js-for-design-management-app.yml
+---
+title: Resolve Implement GraphQL Startup.js for Design Management app
+merge_request: 46660
+author:
+type: other
--- a/changelogs/unreleased/267394-improve-search-empty-message.yml
+++ b/changelogs/unreleased/267394-improve-search-empty-message.yml
+---
+title: Improve empty search results message for group and project scopes
+merge_request: 46237
+author:
+type: changed
--- a/changelogs/unreleased/268000-extend-graphql-measurements-api.yml
+++ b/changelogs/unreleased/268000-extend-graphql-measurements-api.yml
+---
+title: Add filtering by recorded date to instance statistics measurements GraphQL API
+merge_request: 46344
+author:
+type: changed
--- a/changelogs/unreleased/270470-no-query-new-snippet.yml
+++ b/changelogs/unreleased/270470-no-query-new-snippet.yml
+---
+title: Do not query snippet infromation on the new snippet's creation
+merge_request: 46355
+author:
+type: fixed
--- a/changelogs/unreleased/273623-replace-sign-in-text-with-sign-in-text.yml
+++ b/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
--- a/changelogs/unreleased/273801-graphql-fuzzy-search-users.yml
+++ b/changelogs/unreleased/273801-graphql-fuzzy-search-users.yml
+---
+title: Add search param to Users GraphQL type
+merge_request: 46609
+author:
+type: added
--- a/changelogs/unreleased/35404-automatic-rollback-in-case-of-failure.yml
+++ b/changelogs/unreleased/35404-automatic-rollback-in-case-of-failure.yml
+---
+title: Add auto_rollback_enabled column to project_ci_cd_settings table
+merge_request: 45816
+author:
+type: other
--- a/changelogs/unreleased/ff-export_merge_requests_as_csv-default-on.yml
+++ b/changelogs/unreleased/ff-export_merge_requests_as_csv-default-on.yml
+---
+title: Enable MR CSV export
+merge_request: 46662
+author:
+type: added
--- a/changelogs/unreleased/fix-api-boards-docs.yml
+++ b/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
--- a/changelogs/unreleased/improve_performance_of_has_vulnerabilities_scope.yml
+++ b/changelogs/unreleased/improve_performance_of_has_vulnerabilities_scope.yml
+---
+title: Add `has_vulnerabilities` column into project_settings table
+merge_request: 45944
+author:
+type: added
--- a/changelogs/unreleased/lm-upstream-downstream-pipeline.yml
+++ b/changelogs/unreleased/lm-upstream-downstream-pipeline.yml
+---
+title: 'GraphQL: Adds downstream, upstream, source job, path, and project to PipelineType'
+merge_request: 45212
+author:
+type: added
--- a/changelogs/unreleased/ph-removeResolveNoteDefaultEnabled.yml
+++ b/changelogs/unreleased/ph-removeResolveNoteDefaultEnabled.yml
+---
+title: Remove the ability to resole individual notes
+merge_request: 46775
+author:
+type: removed
--- a/changelogs/unreleased/sy-swap-alert-email-api.yml
+++ b/changelogs/unreleased/sy-swap-alert-email-api.yml
+---
+title: Improve messaging for emails from alerts
+merge_request: 43054
+author:
+type: changed
--- a/config/feature_flags/development/cd_auto_rollback.yml
+++ b/config/feature_flags/development/cd_auto_rollback.yml
+---
+name: cd_auto_rollback
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45816
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/35404
+type: development
+group: group::progressive delivery
+default_enabled: false
--- a/config/feature_flags/development/export_merge_requests_as_csv.yml
+++ b/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
--- a/config/feature_flags/development/remove_resolve_note.yml
+++ b/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
--- a/config/feature_flags/development/vue_issue_header.yml
+++ b/config/feature_flags/development/vue_issue_header.yml
+---
+name: vue_issue_header
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44440
+rollout_issue_url:
+type: development
+group: group::project management
+default_enabled: false
--- a/config/initializers/0_inject_feature_flags.rb
+++ b/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

--- a/db/fixtures/development/12_snippets.rb
+++ b/db/fixtures/development/12_snippets.rb
 require './spec/support/sidekiq_middleware'

 SNIPPET_REPO_URL = "https://gitlab.com/gitlab-org/gitlab-snippet-test.git"
+BUNDLE_PATH = File.join(Rails.root, 'db/fixtures/development/gitlab-snippet-test.bundle')
+
+class Gitlab::Seeder::SnippetRepository
+  def initialize(snippet)
+    @snippet = snippet
+  end
+
+  def import
+    if File.exists?(BUNDLE_PATH)
+      @snippet.repository.create_from_bundle(BUNDLE_PATH)
+    else
+      @snippet.repository.import_repository(SNIPPET_REPO_URL)
+      @snippet.repository.bundle_to_disk(BUNDLE_PATH)
+    end
+  end
+
+  def self.cleanup
+    File.delete(BUNDLE_PATH) if File.exists?(BUNDLE_PATH)
+  rescue => e
+    warn "\nError cleaning up snippet bundle: #{e}"
+  end
+end

 Gitlab::Seeder.quiet do
  20.times do |i|
@@ -14,7 +36,7 @@ Gitlab::Seeder.quiet do
      content: 'foo'
    }).tap do |snippet|
      unless snippet.repository_exists?
-        snippet.repository.import_repository(SNIPPET_REPO_URL)
+        Gitlab::Seeder::SnippetRepository.new(snippet).import
      end

      snippet.track_snippet_repository(snippet.repository.storage)
@@ -23,5 +45,7 @@ Gitlab::Seeder.quiet do

    print('.')
  end
+
+  Gitlab::Seeder::SnippetRepository.cleanup
 end

--- a/db/migrate/20201022191817_add_has_vulnerabilities_into_project_settings.rb
+++ b/db/migrate/20201022191817_add_has_vulnerabilities_into_project_settings.rb
+# frozen_string_literal: true
+
+class AddHasVulnerabilitiesIntoProjectSettings < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    with_lock_retries do
+      add_column :project_settings, :has_vulnerabilities, :boolean, default: false, null: false
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :project_settings, :has_vulnerabilities
+    end
+  end
+end
--- a/db/migrate/20201022192254_index_project_settings_on_project_id_partially.rb
+++ b/db/migrate/20201022192254_index_project_settings_on_project_id_partially.rb
+# frozen_string_literal: true
+
+class IndexProjectSettingsOnProjectIdPartially < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_project_settings_on_project_id_partially'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :project_settings, :project_id, name: INDEX_NAME, where: 'has_vulnerabilities IS TRUE'
+  end
+
+  def down
+    remove_concurrent_index_by_name :project_settings, INDEX_NAME
+  end
+end
--- a/db/migrate/20201027135651_add_auto_rollback_setting.rb
+++ b/db/migrate/20201027135651_add_auto_rollback_setting.rb
+# frozen_string_literal: true
+
+class AddAutoRollbackSetting < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    with_lock_retries do
+      add_column :project_ci_cd_settings, :auto_rollback_enabled, :boolean, default: false, null: false
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :project_ci_cd_settings, :auto_rollback_enabled
+    end
+  end
+end
--- a/db/schema_migrations/20201022191817
+++ b/db/schema_migrations/20201022191817
+205cb628e9637bcd1acb90c5211b71b51015fa5f50aadcacd5fbafc4f09c00d0
\ No newline at end of file
--- a/db/schema_migrations/20201022192254
+++ b/db/schema_migrations/20201022192254
+9f942de6f83629a144e9d460b4bed7a246afe95275b5913745109fc0ab9dacc1
\ No newline at end of file
--- a/db/schema_migrations/20201027135651
+++ b/db/schema_migrations/20201027135651
+3f24bfc2d18ffa5f171e027d4e7aaf9994b255e5806e2de57fd36b4a193db122
\ No newline at end of file
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -14866,7 +14866,8 @@ CREATE TABLE project_ci_cd_settings (
    merge_pipelines_enabled boolean,
    default_git_depth integer,
    forward_deployment_enabled boolean,
-    merge_trains_enabled boolean DEFAULT false
+    merge_trains_enabled boolean DEFAULT false,
+    auto_rollback_enabled boolean DEFAULT false NOT NULL
 );

 CREATE SEQUENCE project_ci_cd_settings_id_seq
@@ -15190,6 +15191,7 @@ CREATE TABLE project_settings (
    allow_merge_on_skipped_pipeline boolean,
    squash_option smallint DEFAULT 3,
    has_confluence boolean DEFAULT false NOT NULL,
+    has_vulnerabilities boolean DEFAULT false NOT NULL,
    CONSTRAINT check_bde223416c CHECK ((show_default_award_emojis IS NOT NULL))
 );

@@ -21460,6 +21462,8 @@ CREATE UNIQUE INDEX index_project_repository_states_on_project_id ON project_rep

 CREATE INDEX index_project_repository_storage_moves_on_project_id ON project_repository_storage_moves USING btree (project_id);

+CREATE INDEX index_project_settings_on_project_id_partially ON project_settings USING btree (project_id) WHERE (has_vulnerabilities IS TRUE);
+
 CREATE UNIQUE INDEX index_project_settings_on_push_rule_id ON project_settings USING btree (push_rule_id);

 CREATE INDEX index_project_statistics_on_namespace_id ON project_statistics USING btree (namespace_id);

--- a/doc/administration/consul.md
+++ b/doc/administration/consul.md
@@ -17,12 +17,9 @@ a service networking solution that you can manage by using `/etc/gitlab/gitlab.r

 ## Configure the Consul nodes

-NOTE: **Important:**
-Before proceeding, refer to the
-[available reference architectures](reference_architectures/index.md#available-reference-architectures)
-to find out how many Consul server nodes you should have.
-
-On **each** Consul server node perform the following:
+After you review the [reference architecture](reference_architectures/index.md#available-reference-architectures)
+documentation to determine the number of Consul server nodes you should have,
+on _each_ Consul server node:

 1. Follow the instructions to [install](https://about.gitlab.com/install/)
   GitLab by choosing your preferred platform, but do not supply the
@@ -93,10 +90,9 @@ Consult the [troubleshooting section](#troubleshooting-consul) if the cluster is
 able to recover after the upgrade. The [outage recovery](#outage-recovery) may
 be of particular interest.

-NOTE: **Note:**
-GitLab uses Consul to store only transient data that is easily regenerated. If
-the bundled Consul was not used by any process other than GitLab itself, then
-[rebuilding the cluster from scratch](#recreate-from-scratch) is fine.
+GitLab uses Consul to store only easily regenerated, transient data. If the
+bundled Consul wasn't used by any process other than GitLab itself, you can
+[rebuild the cluster from scratch](#recreate-from-scratch).

 ## Troubleshooting Consul


--- a/doc/administration/geo/replication/datatypes.md
+++ b/doc/administration/geo/replication/datatypes.md
@@ -188,7 +188,7 @@ successfully, you must replicate their data using some other means.
 | [Composer Repository](../../../user/packages/composer_repository/index.md)                                     | **Yes** (13.2)                                                                     | [No](https://gitlab.com/groups/gitlab-org/-/epics/1817)   | Via Object Storage provider if supported. Native Geo support (Beta).                 | Behind feature flag `geo_package_file_replication`, enabled by default                                                                                                                                                                                                                                                     |
 | [Generic packages](../../../user/packages/generic_packages/index.md)                                | **Yes** (13.5)                                                                     | [No](https://gitlab.com/groups/gitlab-org/-/epics/1817)   | Via Object Storage provider if supported. Native Geo support (Beta).                 | Behind feature flag `geo_package_file_replication`, enabled by default                                                                                                                                                                                                                                                     |
 | [Versioned Terraform State](../../terraform_state.md)                                                          | **Yes** (13.5)                                                                     | No                                                        | Via Object Storage provider if supported. Native Geo support (Beta).                 | Behind feature flag `geo_terraform_state_version_replication`, enabled by default                                                                                                                                                                                                                                          |
-| [External merge request diffs](../../merge_request_diffs.md)                                                   | **Yes** (13.5)                          | No                                                        |  Behind feature flag `geo_merge_request_diff_replication`, enabled by default                 |                                                                                                                                                                                                                                                                                                                            |
+| [External merge request diffs](../../merge_request_diffs.md)                                                   | **Yes** (13.5)                          | No                                                        |  Via Object Storage provider if supported. Native Geo support (Beta).                 |  Behind feature flag `geo_merge_request_diff_replication`, enabled by default                                                                                                                                                                                                                                                                                                                          |
 | [Versioned snippets](../../../user/snippets.md#versioned-snippets)                                             | [No](https://gitlab.com/groups/gitlab-org/-/epics/2809)                            | [No](https://gitlab.com/groups/gitlab-org/-/epics/2810)   | No                                                                                   |                                                                                                                                                                                                                                                                                                                            |
 | [Server-side Git hooks](../../server_hooks.md)                                                                 | [No](https://gitlab.com/groups/gitlab-org/-/epics/1867)                            | No                                                        | No                                                                                   |                                                                                                                                                                                                                                                                                                                            |
 | [Elasticsearch integration](../../../integration/elasticsearch.md)                                             | [No](https://gitlab.com/gitlab-org/gitlab/-/issues/1186)                           | No                                                        | No                                                                                   |                                                                                                                                                                                                                                                                                                                            |

--- a/doc/administration/instance_limits.md
+++ b/doc/administration/instance_limits.md
@@ -179,7 +179,6 @@ Plan.default.actual_limits.update!(project_hooks: 100)
 Plan.default.actual_limits.update!(group_hooks: 100)
 ```

-NOTE: **Note:**
 Set the limit to `0` to disable it.

 ## Incoming emails from auto-responders
@@ -217,7 +216,6 @@ Plan.default.actual_limits.update!(offset_pagination_limit: 10000)

 - **Default offset pagination limit:** 50000

-NOTE: **Note:**
 Set the limit to `0` to disable it.

 ## CI/CD limits
@@ -250,7 +248,6 @@ To set this limit on a self-managed installation, run the following in the
 Plan.default.actual_limits.update!(ci_active_jobs: 500)
 ```

-NOTE: **Note:**
 Set the limit to `0` to disable it.

 ### Number of CI/CD subscriptions to a project
@@ -273,7 +270,6 @@ To set this limit on a self-managed installation, run the following in the
 Plan.default.actual_limits.update!(ci_project_subscriptions: 500)
 ```

-NOTE: **Note:**
 Set the limit to `0` to disable it.

 ### Number of pipeline schedules
@@ -462,11 +458,10 @@ Setting a limit helps reduce the memory usage of the indexing processes as well
 as the overall index size. This value defaults to `1024 KiB` (1 MiB) as any
 text files larger than this likely aren't meant to be read by humans.

-NOTE: **Note:**
-You must set a limit, as an unlimited file size is not supported. Setting this
-value to be greater than the amount of memory on GitLab's Sidekiq nodes will
-lead to GitLab's Sidekiq nodes running out of memory as they will pre-allocate
-this amount of memory during indexing.
+You must set a limit, as unlimited file sizes aren't supported. Setting this
+value to be greater than the amount of memory on GitLab's Sidekiq nodes causes
+GitLab's Sidekiq nodes to run out of memory, as they will pre-allocate this
+amount of memory during indexing.

 ### Maximum field length

@@ -486,7 +481,6 @@ indexed](#maximum-file-size-indexed)).
 This limit can be configured for self-managed installations when [enabling
 Elasticsearch](../integration/elasticsearch.md#enabling-advanced-search).

-NOTE: **Note:**
 Set the limit to `0` to disable it.

 ## Wiki limits

--- a/doc/administration/nfs.md
+++ b/doc/administration/nfs.md
@@ -19,11 +19,10 @@ From GitLab 13.0, using NFS for Git repositories is deprecated. In GitLab 14.0,
 support for NFS for Git repositories is scheduled to be removed. Upgrade to
 [Gitaly Cluster](gitaly/praefect.md) as soon as possible.

-NOTE: **Note:**
-Filesystem performance has a big impact on overall GitLab
-performance, especially for actions that read or write to Git repositories. See
-[Filesystem Performance Benchmarking](operations/filesystem_benchmarking.md)
-for steps to test filesystem performance.
+Filesystem performance can impact overall GitLab performance, especially for
+actions that read or write to Git repositories. For steps you can use to test
+filesystem performance, see
+[Filesystem Performance Benchmarking](operations/filesystem_benchmarking.md).

 ## Known kernel version incompatibilities


--- a/doc/administration/object_storage.md
+++ b/doc/administration/object_storage.md
@@ -61,18 +61,17 @@ must be enabled, only the following providers can be used:
 - [Google Cloud Storage](#google-cloud-storage-gcs)
 - [Azure Blob storage](#azure-blob-storage)

-Background upload is not supported with the consolidated object storage
-configuration. We recommend enabling direct upload mode because it does
-not require a shared folder, and [this setting may become the
+Background upload isn't supported with the consolidated object storage
+configuration. We recommend enabling direct upload mode because it doesn't
+require a shared folder, and [this setting may become the
 default](https://gitlab.com/gitlab-org/gitlab/-/issues/27331).

-NOTE: **Note:**
-Consolidated object storage configuration cannot be used for
-backups or Mattermost. See [the full table for a complete list](#storage-specific-configuration).
+Consolidated object storage configuration can't be used for backups or
+Mattermost. See the [full table for a complete list](#storage-specific-configuration).

-NOTE: **Note:**
-Enabling consolidated object storage will enable object storage for all object types.
-If you wish to use local storage for specific object types, you can [selectively disable object storages](#selectively-disabling-object-storage).
+Enabling consolidated object storage enables object storage for all object
+types. If you want to use local storage for specific object types, you can
+[selectively disable object storages](#selectively-disabling-object-storage).

 Most types of objects, such as CI artifacts, LFS files, upload
 attachments, and so on can be saved in object storage by specifying a single
@@ -347,10 +346,9 @@ gitlab_rails['object_store']['connection'] = {

 ###### Azure Workhorse settings (source installs only)

-NOTE: **Note:**
-For source installations, Workhorse needs to be configured with the
-Azure credentials as well. This is not needed in Omnibus installs because
-the Workhorse settings are populated from the settings above.
+For source installations, Workhorse also needs to be configured with Azure
+credentials. This isn't needed in Omnibus installs, because the Workhorse
+settings are populated from the previous settings.

 1. Edit `/home/git/gitlab-workhorse/config.toml` and add or amend the following lines:

@@ -370,14 +368,14 @@ GitLab Rails and Workhorse.

 #### OpenStack-compatible connection settings

-NOTE: **Note:**
-This is not compatible with the consolidated object storage form.
-OpenStack Swift is only supported with the storage-specific form. See the
-[S3 settings](#s3-compatible-connection-settings) if you want to use the consolidated form.
+Although OpenStack Swift provides S3 compatibility, some users may want to use
+the [Swift API](https://docs.openstack.org/swift/latest/api/object_api_v1_overview.html).

-While OpenStack Swift provides S3 compatibility, some users may want to use the
-[Swift API](https://docs.openstack.org/swift/latest/api/object_api_v1_overview.html).
-Here are the valid connection settings below for the Swift API, provided by
+This isn't compatible with the consolidated object storage form. OpenStack Swift
+is supported only with the storage-specific form. If you want to use the
+consolidated form, see the [S3 settings](#s3-compatible-connection-settings).
+
+Here are the valid connection settings for the Swift API, provided by
 [fog-openstack](https://github.com/fog/fog-openstack):

 | Setting | Description | Default |
@@ -392,12 +390,11 @@ Here are the valid connection settings below for the Swift API, provided by

 #### Rackspace Cloud Files

-NOTE: **Note:**
-This is not compatible with the consolidated object
-storage form. Rackspace Cloud is only supported with the storage-specific form.
+The following table describes the valid connection parameters for
+Rackspace Cloud, provided by [fog-rackspace](https://github.com/fog/fog-rackspace/).

-Here are the valid connection parameters for Rackspace Cloud, provided by
-[fog-rackspace](https://github.com/fog/fog-rackspace/):
+This isn't compatible with the consolidated object storage form.
+Rackspace Cloud is supported only with the storage-specific form.

 | Setting | Description | example |
 |---------|-------------|---------|
@@ -407,13 +404,13 @@ Here are the valid connection parameters for Rackspace Cloud, provided by
 | `rackspace_region` | The Rackspace storage region to use, a three letter code from the [list of service access endpoints](https://developer.rackspace.com/docs/cloud-files/v1/general-api-info/service-access/) | `iad` |
 | `rackspace_temp_url_key` | The private key you have set in the Rackspace API for [temporary URLs](https://developer.rackspace.com/docs/cloud-files/v1/use-cases/public-access-to-your-cloud-files-account/#tempurl). | `ABC123DEF456ABC123DEF456ABC123DE` |

-NOTE: **Note:**
-Regardless of whether the container has public access enabled or disabled, Fog will
-use the TempURL method to grant access to LFS objects. If you see errors in logs referencing
-instantiating storage with a `temp-url-key`, ensure that you have set the key properly
-on the Rackspace API and in `gitlab.rb`. You can verify the value of the key Rackspace
-has set by sending a GET request with token header to the service access endpoint URL
-and comparing the output of the returned headers.
+Regardless of whether the container has public access enabled or disabled, Fog
+uses the TempURL method to grant access to LFS objects. If you see error
+messages in logs that refer to instantiating storage with a `temp-url-key`,
+be sure you have set the key properly both in the Rackspace API and in
+`gitlab.rb`. You can verify the value of the key Rackspace has set by sending a
+GET request with token header to the service access endpoint URL and comparing
+the output of the returned headers.

 ### Object-specific configuration

@@ -521,15 +518,16 @@ gitlab_rails['uploads_object_store_remote_directory'] = 'uploads'
 gitlab_rails['uploads_object_store_connection'] = { 'provider' => 'AWS', 'aws_access_key_id' => 'access_key', 'aws_secret_access_key' => 'secret' }
 ```

-While this provides flexibility in that it makes it possible for GitLab
+Although this provides flexibility in that it makes it possible for GitLab
 to store objects across different cloud providers, it also creates
 additional complexity and unnecessary redundancy. Since both GitLab
 Rails and Workhorse components need access to object storage, the
 consolidated form avoids excessive duplication of credentials.

-NOTE: **Note:**
-The consolidated object storage configuration is **only** used if all
-lines from the original form is omitted. To move to the consolidated form, remove the original configuration (for example, `artifacts_object_store_enabled`, `uploads_object_store_connection`, and so on.)
+The consolidated object storage configuration is used _only_ if all lines from
+the original form is omitted. To move to the consolidated form, remove the
+original configuration (for example, `artifacts_object_store_enabled`, or
+`uploads_object_store_connection`)

 ## Storage-specific configuration


--- a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
+++ b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
@@ -999,3 +999,19 @@ project = Project.find_by_full_path('<group/project>')

 Geo::RepositorySyncService.new(project).execute
 ```
+
+### Generate usage ping
+
+#### Generate or get the cached usage ping
+
+```ruby
+Gitlab::UsageData.to_json
+```
+
+#### Generate a fresh new usage ping
+
+This will also refresh the cached usage ping displayed in the admin area
+
+```ruby
+Gitlab::UsageData.to_json(force_refresh: true)
+```
--- a/doc/api/boards.md
+++ b/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
  }
 ```


--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
--- a/doc/api/instance_clusters.md
+++ b/doc/api/instance_clusters.md
--- a/doc/development/experiment_guide/index.md
+++ b/doc/development/experiment_guide/index.md
--- a/doc/operations/error_tracking.md
+++ b/doc/operations/error_tracking.md
--- a/doc/topics/autodevops/customize.md
+++ b/doc/topics/autodevops/customize.md
--- a/doc/user/admin_area/settings/img/custom_sign_in_page_v13_6.png
+++ b/doc/user/admin_area/settings/img/custom_sign_in_page_v13_6.png
--- a/doc/user/admin_area/settings/sign_in_restrictions.md
+++ b/doc/user/admin_area/settings/sign_in_restrictions.md
--- a/doc/user/clusters/agent/index.md
+++ b/doc/user/clusters/agent/index.md
--- a/doc/user/packages/generic_packages/index.md
+++ b/doc/user/packages/generic_packages/index.md
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
--- a/doc/user/project/merge_requests/csv_export.md
+++ b/doc/user/project/merge_requests/csv_export.md
--- a/doc/user/project/repository/reducing_the_repo_size_using_git.md
+++ b/doc/user/project/repository/reducing_the_repo_size_using_git.md
--- a/ee/app/assets/javascripts/analytics/contribution_analytics/components/column_chart.vue
+++ b/ee/app/assets/javascripts/analytics/contribution_analytics/components/column_chart.vue
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/components/tasks_by_type/tasks_by_type_chart.vue
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/components/tasks_by_type/tasks_by_type_chart.vue
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/components/type_of_work_charts.vue
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/components/type_of_work_charts.vue
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/getters.js
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/getters.js
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/utils.js
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/utils.js
--- a/ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue
+++ b/ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue
--- a/ee/app/assets/javascripts/insights/components/insights_chart.vue
+++ b/ee/app/assets/javascripts/insights/components/insights_chart.vue
--- a/ee/app/assets/javascripts/insights/stores/modules/insights/helpers.js
+++ b/ee/app/assets/javascripts/insights/stores/modules/insights/helpers.js
--- a/ee/app/assets/javascripts/issues_analytics/components/issues_analytics.vue
+++ b/ee/app/assets/javascripts/issues_analytics/components/issues_analytics.vue
--- a/ee/app/assets/javascripts/vue_shared/components/members/table/members_table_cell.vue
+++ b/ee/app/assets/javascripts/vue_shared/components/members/table/members_table_cell.vue
--- a/ee/app/assets/javascripts/vue_shared/components/members/utils.js
+++ b/ee/app/assets/javascripts/vue_shared/components/members/utils.js
--- a/ee/app/controllers/ee/projects_controller.rb
+++ b/ee/app/controllers/ee/projects_controller.rb
--- a/ee/app/models/ee/project.rb
+++ b/ee/app/models/ee/project.rb
--- a/ee/app/models/ee/project_ci_cd_setting.rb
+++ b/ee/app/models/ee/project_ci_cd_setting.rb
--- a/ee/app/models/license.rb
+++ b/ee/app/models/license.rb
--- a/ee/app/services/security/store_reports_service.rb
+++ b/ee/app/services/security/store_reports_service.rb
--- a/ee/app/views/projects/settings/ci_cd/_auto_rollback.html.haml
+++ b/ee/app/views/projects/settings/ci_cd/_auto_rollback.html.haml
--- a/ee/changelogs/unreleased/276172-rename-cycle-analytics-with-value-stream-analytics-in-strings-u.yml
+++ b/ee/changelogs/unreleased/276172-rename-cycle-analytics-with-value-stream-analytics-in-strings-u.yml
--- a/ee/config/feature_flags/licensed/group_coverage_reports.yml
+++ b/ee/config/feature_flags/licensed/group_coverage_reports.yml
--- a/ee/lib/ee/gitlab/repository_size_checker.rb
+++ b/ee/lib/ee/gitlab/repository_size_checker.rb
--- a/ee/spec/controllers/projects_controller_spec.rb
+++ b/ee/spec/controllers/projects_controller_spec.rb
--- a/ee/spec/features/issuables/related_issues_spec.rb
+++ b/ee/spec/features/issuables/related_issues_spec.rb
--- a/ee/spec/features/issues/issue_sidebar_spec.rb
+++ b/ee/spec/features/issues/issue_sidebar_spec.rb
--- a/ee/spec/features/projects/settings/auto_rollback_spec.rb
+++ b/ee/spec/features/projects/settings/auto_rollback_spec.rb
--- a/ee/spec/frontend/analytics/contribution_analytics/components/__snapshots__/column_chart_spec.js.snap
+++ b/ee/spec/frontend/analytics/contribution_analytics/components/__snapshots__/column_chart_spec.js.snap
--- a/ee/spec/frontend/analytics/cycle_analytics/__snapshots__/utils_spec.js.snap
+++ b/ee/spec/frontend/analytics/cycle_analytics/__snapshots__/utils_spec.js.snap
--- a/ee/spec/frontend/analytics/cycle_analytics/components/tasks_by_type/__snapshots__/tasks_by_type_chart_spec.js.snap
+++ b/ee/spec/frontend/analytics/cycle_analytics/components/tasks_by_type/__snapshots__/tasks_by_type_chart_spec.js.snap
--- a/ee/spec/frontend/analytics/cycle_analytics/components/type_of_work_charts_spec.js
+++ b/ee/spec/frontend/analytics/cycle_analytics/components/type_of_work_charts_spec.js
--- a/ee/spec/frontend/analytics/cycle_analytics/store/actions_spec.js
+++ b/ee/spec/frontend/analytics/cycle_analytics/store/actions_spec.js
--- a/ee/spec/frontend/analytics/cycle_analytics/store/getters_spec.js
+++ b/ee/spec/frontend/analytics/cycle_analytics/store/getters_spec.js
--- a/ee/spec/frontend/analytics/cycle_analytics/store/modules/type_of_work/getters_spec.js
+++ b/ee/spec/frontend/analytics/cycle_analytics/store/modules/type_of_work/getters_spec.js
--- a/ee/spec/frontend/analytics/cycle_analytics/store/modules/type_of_work/mutations_spec.js
+++ b/ee/spec/frontend/analytics/cycle_analytics/store/modules/type_of_work/mutations_spec.js
--- a/ee/spec/frontend/analytics/cycle_analytics/store/mutations_spec.js
+++ b/ee/spec/frontend/analytics/cycle_analytics/store/mutations_spec.js
--- a/ee/spec/frontend/analytics/cycle_analytics/utils_spec.js
+++ b/ee/spec/frontend/analytics/cycle_analytics/utils_spec.js
--- a/ee/spec/frontend/api_spec.js
+++ b/ee/spec/frontend/api_spec.js
--- a/ee/spec/frontend/fixtures/issues.rb
+++ b/ee/spec/frontend/fixtures/issues.rb
--- a/ee/spec/frontend/insights/mock_data.js
+++ b/ee/spec/frontend/insights/mock_data.js
--- a/ee/spec/frontend/insights/stores/insights/helpers_spec.js
+++ b/ee/spec/frontend/insights/stores/insights/helpers_spec.js
--- a/ee/spec/frontend/insights/stores/insights/mutations_spec.js
+++ b/ee/spec/frontend/insights/stores/insights/mutations_spec.js
--- a/ee/spec/frontend/vue_shared/components/members/table/members_table_spec.js
+++ b/ee/spec/frontend/vue_shared/components/members/table/members_table_spec.js
--- a/ee/spec/frontend/vue_shared/components/members/utils_spec.js
+++ b/ee/spec/frontend/vue_shared/components/members/utils_spec.js
--- a/ee/spec/frontend_integration/.eslintrc.yml
+++ b/ee/spec/frontend_integration/.eslintrc.yml
--- a/ee/spec/frontend_integration/README.md
+++ b/ee/spec/frontend_integration/README.md
--- a/ee/spec/frontend_integration/security_dashboard/__snapshots__/first_class_init_integration_spec.js.snap
+++ b/ee/spec/frontend_integration/security_dashboard/__snapshots__/first_class_init_integration_spec.js.snap
--- a/ee/spec/frontend_integration/security_dashboard/__snapshots__/security_charts_init_integration_spec.js.snap
+++ b/ee/spec/frontend_integration/security_dashboard/__snapshots__/security_charts_init_integration_spec.js.snap
--- a/ee/spec/frontend_integration/security_dashboard/first_class_init_integration_spec.js
+++ b/ee/spec/frontend_integration/security_dashboard/first_class_init_integration_spec.js
--- a/ee/spec/frontend_integration/security_dashboard/security_charts_init_integration_spec.js
+++ b/ee/spec/frontend_integration/security_dashboard/security_charts_init_integration_spec.js
--- a/ee/spec/frontend_integration/test_setup.js
+++ b/ee/spec/frontend_integration/test_setup.js
--- a/ee/spec/lib/ee/gitlab/repository_size_checker_spec.rb
+++ b/ee/spec/lib/ee/gitlab/repository_size_checker_spec.rb
--- a/ee/spec/models/project_ci_cd_setting_spec.rb
+++ b/ee/spec/models/project_ci_cd_setting_spec.rb
--- a/ee/spec/services/security/store_reports_service_spec.rb
+++ b/ee/spec/services/security/store_reports_service_spec.rb
--- a/lib/gitlab/ci/features.rb
+++ b/lib/gitlab/ci/features.rb
--- a/lib/gitlab/danger/commit_linter.rb
+++ b/lib/gitlab/danger/commit_linter.rb
--- a/lib/gitlab/webpack/dev_server_middleware.rb
+++ b/lib/gitlab/webpack/dev_server_middleware.rb
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
--- a/package.json
+++ b/package.json
--- a/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb
--- a/qa/qa/specs/features/browser_ui/5_package/pypi_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/pypi_repository_spec.rb
--- a/spec/controllers/projects/registry/repositories_controller_spec.rb
+++ b/spec/controllers/projects/registry/repositories_controller_spec.rb
--- a/spec/controllers/projects/registry/tags_controller_spec.rb
+++ b/spec/controllers/projects/registry/tags_controller_spec.rb
--- a/spec/controllers/projects/settings/operations_controller_spec.rb
+++ b/spec/controllers/projects/settings/operations_controller_spec.rb
--- a/spec/controllers/projects/settings/repository_controller_spec.rb
+++ b/spec/controllers/projects/settings/repository_controller_spec.rb
--- a/spec/features/incidents/user_views_incident_spec.rb
+++ b/spec/features/incidents/user_views_incident_spec.rb
--- a/spec/features/issuables/close_reopen_report_toggle_spec.rb
+++ b/spec/features/issuables/close_reopen_report_toggle_spec.rb
--- a/spec/features/issues/user_views_issue_spec.rb
+++ b/spec/features/issues/user_views_issue_spec.rb
--- a/spec/frontend/design_management/mock_data/apollo_mock.js
+++ b/spec/frontend/design_management/mock_data/apollo_mock.js
--- a/spec/frontend/design_management/pages/index_spec.js
+++ b/spec/frontend/design_management/pages/index_spec.js
--- a/spec/frontend/fixtures/issues.rb
+++ b/spec/frontend/fixtures/issues.rb
--- a/spec/frontend/groups/components/app_spec.js
+++ b/spec/frontend/groups/components/app_spec.js
--- a/spec/frontend/groups/components/item_actions_spec.js
+++ b/spec/frontend/groups/components/item_actions_spec.js
--- a/spec/frontend/helpers/mock_apollo_helper.js
+++ b/spec/frontend/helpers/mock_apollo_helper.js
--- a/spec/frontend/issue_show/components/header_actions_spec.js
+++ b/spec/frontend/issue_show/components/header_actions_spec.js
--- a/spec/frontend/issue_show/issue_spec.js
+++ b/spec/frontend/issue_show/issue_spec.js
--- a/spec/frontend/monitoring/components/charts/column_spec.js
+++ b/spec/frontend/monitoring/components/charts/column_spec.js
--- a/spec/frontend/monitoring/components/charts/stacked_column_spec.js
+++ b/spec/frontend/monitoring/components/charts/stacked_column_spec.js
--- a/spec/frontend/pipeline_editor/components/text_editor_spec.js
+++ b/spec/frontend/pipeline_editor/components/text_editor_spec.js
--- a/spec/frontend/pipeline_editor/pipeline_editor_app_spec.js
+++ b/spec/frontend/pipeline_editor/pipeline_editor_app_spec.js
--- a/spec/frontend/projects/pipelines/charts/components/app_spec.js
+++ b/spec/frontend/projects/pipelines/charts/components/app_spec.js
--- a/spec/frontend/snippets/components/edit_spec.js
+++ b/spec/frontend/snippets/components/edit_spec.js
--- a/spec/frontend/snippets/components/snippet_visibility_edit_spec.js
+++ b/spec/frontend/snippets/components/snippet_visibility_edit_spec.js
--- a/spec/frontend/vue_shared/components/members/table/members_table_spec.js
+++ b/spec/frontend/vue_shared/components/members/table/members_table_spec.js
--- a/spec/frontend/vue_shared/components/members/utils_spec.js
+++ b/spec/frontend/vue_shared/components/members/utils_spec.js
--- a/spec/graphql/mutations/alert_management/http_integration/destroy_spec.rb
+++ b/spec/graphql/mutations/alert_management/http_integration/destroy_spec.rb
--- a/spec/graphql/resolvers/admin/analytics/instance_statistics/measurements_resolver_spec.rb
+++ b/spec/graphql/resolvers/admin/analytics/instance_statistics/measurements_resolver_spec.rb
--- a/spec/graphql/resolvers/users_resolver_spec.rb
+++ b/spec/graphql/resolvers/users_resolver_spec.rb
--- a/spec/helpers/search_helper_spec.rb
+++ b/spec/helpers/search_helper_spec.rb
--- a/spec/lib/api/helpers_spec.rb
+++ b/spec/lib/api/helpers_spec.rb
--- a/spec/lib/gitlab/danger/commit_linter_spec.rb
+++ b/spec/lib/gitlab/danger/commit_linter_spec.rb
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
--- a/spec/mailers/emails/projects_spec.rb
+++ b/spec/mailers/emails/projects_spec.rb
--- a/spec/models/analytics/instance_statistics/measurement_spec.rb
+++ b/spec/models/analytics/instance_statistics/measurement_spec.rb
--- a/spec/requests/api/files_spec.rb
+++ b/spec/requests/api/files_spec.rb
--- a/spec/requests/api/graphql/ci/pipelines_spec.rb
+++ b/spec/requests/api/graphql/ci/pipelines_spec.rb
--- a/spec/requests/api/graphql/instance_statistics_measurements_spec.rb
+++ b/spec/requests/api/graphql/instance_statistics_measurements_spec.rb
--- a/spec/requests/api/graphql/mutations/alert_management/http_integration/destroy_spec.rb
+++ b/spec/requests/api/graphql/mutations/alert_management/http_integration/destroy_spec.rb
--- a/spec/requests/api/project_container_repositories_spec.rb
+++ b/spec/requests/api/project_container_repositories_spec.rb
--- a/spec/services/alert_management/http_integrations/destroy_service_spec.rb
+++ b/spec/services/alert_management/http_integrations/destroy_service_spec.rb
--- a/spec/services/alert_management/process_prometheus_alert_service_spec.rb
+++ b/spec/services/alert_management/process_prometheus_alert_service_spec.rb
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
--- a/spec/services/projects/alerting/notify_service_spec.rb
+++ b/spec/services/projects/alerting/notify_service_spec.rb
--- a/spec/services/projects/cleanup_service_spec.rb
+++ b/spec/services/projects/cleanup_service_spec.rb
--- a/spec/support/shared_examples/controllers/trackable_shared_examples.rb
+++ b/spec/support/shared_examples/controllers/trackable_shared_examples.rb
--- a/spec/support/shared_examples/requests/api/discussions_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/discussions_shared_examples.rb
--- a/spec/support/shared_examples/requests/api/packages_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/packages_shared_examples.rb
--- a/spec/support/shared_examples/requests/api/tracking_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/tracking_shared_examples.rb
--- a/spec/workers/repository_cleanup_worker_spec.rb
+++ b/spec/workers/repository_cleanup_worker_spec.rb
--- a/yarn.lock
+++ b/yarn.lock