Merge branch 'fzimmer-master-patch-97406' into 'master'

Fixed column for feature flag

See merge request gitlab-org/gitlab!46472

.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$/'
 
 #################

.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
@@ -1113,60 +1100,13 @@ Rails/SaveBang:
 # Cop supports --auto-correct.
 RSpec/TimecopFreeze:
   Exclude:
-    - 'ee/spec/controllers/admin/application_settings_controller_spec.rb'
-    - 'ee/spec/controllers/projects/security/network_policies_controller_spec.rb'
-    - 'ee/spec/features/admin/admin_reset_pipeline_minutes_spec.rb'
-    - 'ee/spec/features/boards/sidebar_spec.rb'
-    - 'ee/spec/features/groups/analytics/cycle_analytics/filters_and_data_spec.rb'
-    - 'ee/spec/features/groups/iteration_spec.rb'
-    - 'ee/spec/features/projects/mirror_spec.rb'
-    - 'ee/spec/features/projects/services/prometheus_custom_metrics_spec.rb'
-    - 'ee/spec/finders/productivity_analytics_finder_spec.rb'
-    - 'ee/spec/frontend/fixtures/analytics.rb'
-    - 'ee/spec/helpers/vulnerabilities_helper_spec.rb'
-    - 'ee/spec/lib/analytics/merge_request_metrics_refresh_spec.rb'
-    - 'ee/spec/lib/analytics/productivity_analytics_request_params_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/populate_vulnerability_historical_statistics_spec.rb'
-    - 'ee/spec/lib/gitlab/analytics/cycle_analytics/data_collector_spec.rb'
-    - 'ee/spec/lib/gitlab/analytics/cycle_analytics/group_stage_time_summary_spec.rb'
-    - 'ee/spec/lib/gitlab/analytics/cycle_analytics/summary/group/stage_time_summary_spec.rb'
-    - 'ee/spec/lib/gitlab/analytics/type_of_work/tasks_by_type_spec.rb'
-    - 'ee/spec/lib/gitlab/auth/group_saml/sso_enforcer_spec.rb'
-    - 'ee/spec/lib/gitlab/database/load_balancing/host_spec.rb'
-    - 'ee/spec/lib/gitlab/geo/base_request_spec.rb'
-    - 'ee/spec/lib/gitlab/geo/event_gap_tracking_spec.rb'
     - 'ee/spec/lib/gitlab/geo/git_push_http_spec.rb'
     - 'ee/spec/lib/gitlab/geo/log_cursor/daemon_spec.rb'
-    - 'ee/spec/lib/gitlab/geo/log_cursor/events/repository_updated_event_spec.rb'
+    - 'ee/spec/lib/gitlab/analytics/cycle_analytics/data_collector_spec.rb'
     - 'ee/spec/lib/gitlab/geo/oauth/login_state_spec.rb'
     - 'ee/spec/lib/gitlab/insights/reducers/count_per_period_reducer_spec.rb'
-    - 'ee/spec/lib/gitlab/prometheus/queries/additional_metrics_environment_query_spec.rb'
-    - 'ee/spec/lib/gitlab/prometheus/queries/cluster_query_spec.rb'
-    - 'ee/spec/migrations/populate_vulnerability_historical_statistics_for_year_spec.rb'
-    - 'ee/spec/migrations/remove_duplicated_cs_findings_spec.rb'
-    - 'ee/spec/migrations/remove_duplicated_cs_findings_without_vulnerability_id_spec.rb'
-    - 'ee/spec/migrations/schedule_fix_orphan_promoted_issues_spec.rb'
-    - 'ee/spec/migrations/schedule_merge_request_any_approval_rule_migration_spec.rb'
-    - 'ee/spec/migrations/schedule_populate_resolved_on_default_branch_column_spec.rb'
-    - 'ee/spec/migrations/schedule_populate_vulnerability_historical_statistics_spec.rb'
-    - 'ee/spec/migrations/schedule_project_any_approval_rule_migration_spec.rb'
-    - 'ee/spec/migrations/set_resolved_state_on_vulnerabilities_spec.rb'
-    - 'ee/spec/migrations/20190926180443_schedule_epic_issues_after_epics_move_spec.rb'
-    - 'ee/spec/models/analytics/cycle_analytics/group_level_spec.rb'
-    - 'ee/spec/models/burndown_spec.rb'
-    - 'ee/spec/models/ee/namespace_spec.rb'
-    - 'ee/spec/models/geo/project_registry_spec.rb'
     - 'ee/spec/models/merge_train_spec.rb'
-    - 'ee/spec/models/productivity_analytics_spec.rb'
-    - 'ee/spec/models/project_spec.rb'
-    - 'ee/spec/models/vulnerabilities/export_spec.rb'
-    - 'ee/spec/requests/api/vulnerabilities_spec.rb'
-    - 'ee/spec/services/geo/file_download_service_spec.rb'
-    - 'ee/spec/services/vulnerabilities/confirm_service_spec.rb'
-    - 'ee/spec/services/vulnerabilities/dismiss_service_spec.rb'
-    - 'ee/spec/services/vulnerabilities/resolve_service_spec.rb'
-    - 'ee/spec/services/vulnerabilities/revert_to_detected_service_spec.rb'
-    - 'ee/spec/services/vulnerability_exports/export_service_spec.rb'
+    - 'ee/spec/frontend/fixtures/analytics.rb'
     - 'ee/spec/support/shared_contexts/lib/gitlab/insights/reducers/reducers_shared_contexts.rb'
     - 'qa/spec/support/repeater_spec.rb'
     - 'spec/features/profiles/active_sessions_spec.rb'

GITALY_SERVER_VERSION

-991ab1619abd34de70388d277892af9ad4c4994c
+940a45ca938b20031820a4976f936a5b6173de92

Gemfile

@@ -377,7 +377,7 @@ group :development, :test do
   gem 'rubocop-rspec', '~> 1.37.0'
 
   gem 'scss_lint', '~> 0.56.0', require: false
-  gem 'haml_lint', '~> 0.34.0', require: false
+  gem 'haml_lint', '~> 0.36.0', require: false
   gem 'bundler-audit', '~> 0.6.1', require: false
 
   gem 'benchmark-ips', '~> 2.3.0', require: false

Gemfile.lock

@@ -548,8 +548,9 @@ GEM
     haml (5.1.2)
       temple (>= 0.8.0)
       tilt
-    haml_lint (0.34.0)
-      haml (>= 4.0, < 5.2)
+    haml_lint (0.36.0)
+      haml (>= 4.0, < 5.3)
+      parallel (~> 1.10)
       rainbow
       rubocop (>= 0.50.0)
       sysexits (~> 1.1)
@@ -1370,7 +1371,7 @@ DEPENDENCIES
   grpc (~> 1.30.2)
   gssapi
   guard-rspec
-  haml_lint (~> 0.34.0)
+  haml_lint (~> 0.36.0)
   hamlit (~> 2.11.0)
   hangouts-chat (~> 0.0.5)
   hashie

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

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

app/assets/javascripts/ci_lint/components/ci_lint.vue

@@ -27,6 +27,7 @@ export default {
   data() {
     return {
       content: '',
+      loading: false,
       valid: false,
       errors: null,
       warnings: null,
@@ -44,6 +45,7 @@ export default {
   },
   methods: {
     async lint() {
+      this.loading = true;
       try {
         const {
           data: {
@@ -62,6 +64,8 @@ export default {
       } catch (error) {
         this.apiError = error;
         this.isErrorDismissed = false;
+      } finally {
+        this.loading = false;
       }
     },
     clear() {
@@ -93,6 +97,7 @@ export default {
       <div class="gl-display-flex gl-align-items-center">
         <gl-button
           class="gl-mr-4"
+          :loading="loading"
           category="primary"
           variant="success"
           data-testid="ci-lint-validate"

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';
 

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 {

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';
 

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 {

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,

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>

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>

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,

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>

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');

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),
+  });
+}

app/assets/javascripts/issue_show/queries/update_issue.mutation.graphql

+mutation updateIssue($input: UpdateIssueInput!) {
+  updateIssue(input: $input) {
+    errors
+  }
+}

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

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

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

@@ -61,14 +61,16 @@ export default {
   },
   computed: {
     chartData() {
-      return this.graphData.metrics.map(({ result }) => {
+      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"

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

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

app/assets/javascripts/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();
 

app/assets/javascripts/pages/shared/wikis/components/delete_wiki_modal.vue

 <script>
 import { GlButton, GlModal, GlModalDirective } from '@gitlab/ui';
 import { escape } from 'lodash';
-import { s__, sprintf } from '~/locale';
+import { s__, __, sprintf } from '~/locale';
 
 export default {
   components: {
@@ -29,12 +29,6 @@ export default {
     },
   },
   computed: {
-    modalId() {
-      return 'delete-wiki-modal';
-    },
-    message() {
-      return s__('WikiPageConfirmDelete|Are you sure you want to delete this page?');
-    },
     title() {
       return sprintf(
         s__('WikiPageConfirmDelete|Delete page %{pageTitle}?'),
@@ -44,6 +38,17 @@ export default {
         false,
       );
     },
+    primaryProps() {
+      return {
+        text: this.$options.i18n.deletePageText,
+        attributes: { variant: 'danger', 'data-qa-selector': 'confirm_deletion_button' },
+      };
+    },
+    cancelProps() {
+      return {
+        text: this.$options.i18n.cancelButtonText,
+      };
+    },
   },
   methods: {
     onSubmit() {
@@ -51,30 +56,36 @@ export default {
       this.$refs.form.submit();
     },
   },
+  i18n: {
+    deletePageText: s__('WikiPageConfirmDelete|Delete page'),
+    modalBody: s__('WikiPageConfirmDelete|Are you sure you want to delete this page?'),
+    cancelButtonText: __('Cancel'),
+  },
+  modal: {
+    modalId: 'delete-wiki-modal',
+  },
 };
 </script>
 
 <template>
   <div class="d-inline-block">
     <gl-button
-      v-gl-modal="modalId"
-      category="primary"
+      v-gl-modal="$options.modal.modalId"
+      category="secondary"
       variant="danger"
       data-qa-selector="delete_button"
     >
-      {{ __('Delete') }}
+      {{ $options.i18n.deletePageText }}
     </gl-button>
     <gl-modal
       :title="title"
-      :action-primary="{
-        text: s__('WikiPageConfirmDelete|Delete page'),
-        attributes: { variant: 'danger', 'data-qa-selector': 'confirm_deletion_button' },
-      }"
-      :modal-id="modalId"
-      title-tag="h4"
+      :action-primary="primaryProps"
+      :action-cancel="cancelProps"
+      :modal-id="$options.modal.modalId"
+      size="sm"
       @ok="onSubmit"
     >
-      {{ message }}
+      {{ $options.i18n.modalBody }}
       <form ref="form" :action="deleteWikiUrl" method="post" class="js-requires-input">
         <input ref="method" type="hidden" name="_method" value="delete" />
         <input :value="csrfToken" type="hidden" name="authenticity_token" />

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>

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>

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

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

app/assets/javascripts/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"

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>

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: {

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,
     };
   },

app/assets/javascripts/snippets/queries/snippet_visibility.query.graphql

-query defaultSnippetVisibility {
-  visibilityLevels @client
-  selectedLevel @client
-  multipleLevelsRestricted @client
-}

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

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

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

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

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

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

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

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

app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue

@@ -92,6 +92,13 @@ export default {
         }
       }
     },
+    handleComponentAppear() {
+      // We can avoid putting `catch` block here
+      // as failure is handled within actions.js already.
+      return this.fetchLabels().then(() => {
+        this.$refs.searchInput.focusInput();
+      });
+    },
     /**
      * We want to remove loaded labels to ensure component
      * fetches fresh set of labels every time when shown.
@@ -139,7 +146,7 @@ export default {
 </script>
 
 <template>
-  <gl-intersection-observer @appear="fetchLabels" @disappear="handleComponentDisappear">
+  <gl-intersection-observer @appear="handleComponentAppear" @disappear="handleComponentDisappear">
     <div class="labels-select-contents-list js-labels-list" @keydown="handleKeyDown">
       <div
         v-if="isDropdownVariantSidebar || isDropdownVariantEmbedded"
@@ -158,8 +165,8 @@ export default {
       </div>
       <div class="dropdown-input" @click.stop="() => {}">
         <gl-search-box-by-type
+          ref="searchInput"
           v-model="searchKey"
-          :autofocus="true"
           :disabled="labelsFetchInProgress"
           data-qa-selector="dropdown_input_field"
         />

app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js

@@ -20,7 +20,7 @@ export const receiveLabelsFailure = ({ commit }) => {
 };
 export const fetchLabels = ({ state, dispatch }) => {
   dispatch('requestLabels');
-  axios
+  return axios
     .get(state.labelsFetchPath)
     .then(({ data }) => {
       dispatch('receiveLabelsSuccess', data);

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

app/controllers/projects/merge_requests_controller.rb

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

app/controllers/projects/settings/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|

app/controllers/projects/settings/repository_controller.rb

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

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

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
 

app/assets/javascripts/design_management/graphql/queries/design_permissions.query.graphql → app/graphql/queries/design_management/design_permissions.query.graphql

 query permissions($fullPath: ID!, $iid: String!) {
   project(fullPath: $fullPath) {
+    __typename
     id
     issue(iid: $iid) {
+      __typename
       userPermissions {
+        __typename
         createDesign
       }
     }

app/assets/javascripts/design_management/graphql/queries/get_design_list.query.graphql → app/graphql/queries/design_management/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
           }
         }
       }

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

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

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
 

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

app/graphql/types/merge_request_type.rb

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

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

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')

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)

app/mailers/emails/projects.rb

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

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

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

app/services/alert_management/process_prometheus_alert_service.rb

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

app/services/notification_service.rb

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

app/services/projects/alerting/notify_service.rb

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

app/services/projects/cleanup_service.rb

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

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

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

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

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

app/views/notify/prometheus_alert_fired_email.html.haml

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

app/views/notify/prometheus_alert_fired_email.text.erb

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

app/views/projects/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

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

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

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

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)

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" } }

app/workers/repository_cleanup_worker.rb

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

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

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

changelogs/unreleased/229685-update-leave-group-modal.yml

+---
+title: Update leave group modal to gl-modal
+merge_request: 41817
+author:
+type: changed

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

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

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

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

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

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

changelogs/unreleased/273801-graphql-fuzzy-search-users.yml

+---
+title: Add search param to Users GraphQL type
+merge_request: 46609
+author:
+type: added

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

changelogs/unreleased/auto-deploy-1-0-7.yml

+---
+title: 'Auto Deploy: fixes issues for fetching other charts from stable repo'
+merge_request: 46531
+author:
+type: fixed

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

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

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

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

changelogs/unreleased/improve_performance_of_has_vulnerabilities_scope.yml

+---
+title: Add `has_vulnerabilities` column into project_settings table
+merge_request: 45944
+author:
+type: added

changelogs/unreleased/kp-fix-labels-dropdown-search-autofocus.yml

+---
+title: Autofocus on search input within labels dropdown after labels are loaded
+merge_request: 46750
+author:
+type: fixed

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

changelogs/unreleased/ph-removeResolveNoteDefaultEnabled.yml

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

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

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

changelogs/unreleased/update-haml_lint-to-0-36-0.yml

+---
+title: Update haml_lint from 0.34.0 to 0.36.0
+merge_request: 44914
+author: Takuya Noguchi
+type: other

changelogs/unreleased/wiki-delete.yml

+---
+title: Minor UI improvements to Wiki Delete Page button and modal
+merge_request: 45740
+author:
+type: changed

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

config/feature_flags/development/export_merge_requests_as_csv.yml

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

config/feature_flags/development/remove_resolve_note.yml

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

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

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

danger/commit_messages/Dangerfile

@@ -101,25 +101,27 @@ end
 
 def lint_commits(commits)
   commit_linters = commits.map { |commit| lint_commit(commit) }
-  failed_commit_linters = commit_linters.select { |commit_linter| commit_linter.failed? }
-  warn_or_fail_commits(failed_commit_linters, default_to_fail: !squash_mr?)
-
-  if count_non_fixup_commits(commit_linters) > MAX_COMMITS_COUNT
-    self.warn(format(MAX_COMMITS_COUNT_EXCEEDED_MESSAGE, max_commits_count: MAX_COMMITS_COUNT))
-  end
 
   if squash_mr?
     multi_line_commit_linter = commit_linters.detect { |commit_linter| !commit_linter.merge? && commit_linter.multi_line? }
 
     if multi_line_commit_linter && multi_line_commit_linter.failed?
       warn_or_fail_commits(multi_line_commit_linter)
+      commit_linters.delete(multi_line_commit_linter) # Don't show an error (here) and a warning (below)
     elsif gitlab_danger.ci? # We don't have access to the MR title locally
       title_linter = lint_mr_title(gitlab.mr_json['title'])
       if title_linter.failed?
         warn_or_fail_commits(title_linter)
       end
     end
+  else
+    if count_non_fixup_commits(commit_linters) > MAX_COMMITS_COUNT
+      self.warn(format(MAX_COMMITS_COUNT_EXCEEDED_MESSAGE, max_commits_count: MAX_COMMITS_COUNT))
+    end
   end
+
+  failed_commit_linters = commit_linters.select { |commit_linter| commit_linter.failed? }
+  warn_or_fail_commits(failed_commit_linters, default_to_fail: !squash_mr?)
 end
 
 def warn_or_fail_commits(failed_linters, default_to_fail: true)

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
 

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

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

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