.gitlab/ci/frontend.gitlab-ci.yml

@@ -306,6 +306,11 @@ qa-frontend-node:latest:
     - .qa-frontend-node
     - .frontend:rules:qa-frontend-node-latest
   image: ${GITLAB_DEPENDENCY_PROXY}node:latest
+  # This is a workaround for https://github.com/webpack/webpack/issues/14532 until
+  # we can upgrade to Webpack 5 and switch to SHA256: https://gitlab.com/gitlab-org/gitlab/-/issues/350120
+  script:
+    - *yarn-install
+    - run_timed_command "retry yarn run webpack-prod-node-latest"
 
 webpack-dev-server:
   extends:

.gitlab/ci/rails.gitlab-ci.yml

@@ -346,7 +346,7 @@ rspec fast_spec_helper minimal:
 db:rollback:
   extends: .db-job-base
   script:
-    - scripts/db_tasks db:migrate VERSION=20181228175414
+    - scripts/db_tasks db:migrate VERSION=20210301200959
     - scripts/db_tasks db:migrate SKIP_SCHEMA_VERSION_CHECK=true
 
 db:rollback decomposed:

.rubocop_todo/rails/save_bang.yml

@@ -18,16 +18,6 @@ Rails/SaveBang:
   - ee/spec/models/visible_approvable_spec.rb
   - ee/spec/models/vulnerabilities/feedback_spec.rb
   - ee/spec/models/vulnerabilities/issue_link_spec.rb
-  - ee/spec/services/ee/merge_requests/update_service_spec.rb
-  - ee/spec/services/ee/notes/quick_actions_service_spec.rb
-  - ee/spec/services/ee/notification_service_spec.rb
-  - ee/spec/services/epic_links/create_service_spec.rb
-  - ee/spec/services/epics/close_service_spec.rb
-  - ee/spec/services/epics/issue_promote_service_spec.rb
-  - ee/spec/services/epics/reopen_service_spec.rb
-  - ee/spec/services/epics/tree_reorder_service_spec.rb
-  - ee/spec/services/epics/update_dates_service_spec.rb
-  - ee/spec/services/epics/update_service_spec.rb
   - ee/spec/services/geo/blob_verification_secondary_service_spec.rb
   - ee/spec/services/geo/files_expire_service_spec.rb
   - ee/spec/services/geo/metrics_update_service_spec.rb

.rubocop_todo/style/open_struct_use.yml

@@ -25,17 +25,13 @@ Style/OpenStructUse:
   - spec/graphql/mutations/commits/create_spec.rb
   - spec/helpers/application_settings_helper_spec.rb
   - spec/helpers/profiles_helper_spec.rb
-  - spec/initializers/doorkeeper_spec.rb
   - spec/lib/gitlab/auth/o_auth/provider_spec.rb
-  - spec/lib/gitlab/database/migrations/runner_spec.rb
   - spec/lib/gitlab/gitaly_client/blobs_stitcher_spec.rb
   - spec/lib/gitlab/gitaly_client/diff_stitcher_spec.rb
   - spec/lib/gitlab/legacy_github_import/project_creator_spec.rb
   - spec/lib/gitlab/quick_actions/command_definition_spec.rb
   - spec/models/design_management/design_action_spec.rb
   - spec/models/design_management/design_at_version_spec.rb
-  - spec/models/user_spec.rb
-  - spec/presenters/packages/nuget/search_results_presenter_spec.rb
   - spec/services/packages/nuget/metadata_extraction_service_spec.rb
   - spec/services/projects/import_service_spec.rb
   - spec/services/system_note_service_spec.rb

GITALY_SERVER_VERSION

-e02b0d67e48ed5a4493b073c9836d376a780f34d
+7055518ce76486791c3450a8a47b673891b6e2d6

Gemfile

@@ -313,7 +313,7 @@ gem 'pg_query', '~> 2.1'
 gem 'premailer-rails', '~> 1.10.3'
 
 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.21.1'
+gem 'gitlab-labkit', '~> 0.21.3'
 # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
 gem 'thrift', '>= 0.14.0'
@@ -485,14 +485,14 @@ end
 gem 'spamcheck', '~> 0.1.0'
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 14.4.0.pre.rc43'
+gem 'gitaly', '~> 14.6.0.pre.rc1'
 
 # KAS GRPC protocol definitions
 gem 'kas-grpc', '~> 0.0.2'
 
-gem 'grpc', '~> 1.30.2'
+gem 'grpc', '~> 1.42.0'
 
-gem 'google-protobuf', '~> 3.17.1'
+gem 'google-protobuf', '~> 3.19.0'
 
 gem 'toml-rb', '~> 2.0'
 

Gemfile.lock

@@ -452,7 +452,7 @@ GEM
       rails (>= 3.2.0)
     git (1.7.0)
       rchardet (~> 1.8)
-    gitaly (14.4.0.pre.rc43)
+    gitaly (14.6.0.pre.rc1)
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab (4.16.1)
@@ -474,10 +474,10 @@ GEM
       fog-json (~> 1.2.0)
       mime-types
       ms_rest_azure (~> 0.12.0)
-    gitlab-labkit (0.21.1)
+    gitlab-labkit (0.21.3)
       actionpack (>= 5.0.0, < 7.0.0)
       activesupport (>= 5.0.0, < 7.0.0)
-      grpc (~> 1.30.2)
+      grpc (>= 1.37)
       jaeger-client (~> 1.1)
       opentracing (~> 0.4)
       pg_query (~> 2.1)
@@ -531,8 +531,8 @@ GEM
       signet (~> 0.12)
     google-cloud-env (1.5.0)
       faraday (>= 0.17.3, < 2.0)
-    google-protobuf (3.17.3)
-    googleapis-common-protos-types (1.1.0)
+    google-protobuf (3.19.1)
+    googleapis-common-protos-types (1.3.0)
       google-protobuf (~> 3.14)
     googleauth (0.14.0)
       faraday (>= 0.17.3, < 2.0)
@@ -580,8 +580,8 @@ GEM
       graphql (~> 1.6)
       html-pipeline (~> 2.8)
       sass (~> 3.4)
-    grpc (1.30.2)
-      google-protobuf (~> 3.12)
+    grpc (1.42.0)
+      google-protobuf (~> 3.18)
       googleapis-common-protos-types (~> 1.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
@@ -1473,13 +1473,13 @@ DEPENDENCIES
   gettext (~> 3.3)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 14.4.0.pre.rc43)
+  gitaly (~> 14.6.0.pre.rc1)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
   gitlab-dangerfiles (~> 2.6.1)
   gitlab-experiment (~> 0.6.5)
   gitlab-fog-azure-rm (~> 1.2.0)
-  gitlab-labkit (~> 0.21.1)
+  gitlab-labkit (~> 0.21.3)
   gitlab-license (~> 2.0)
   gitlab-license_finder (~> 6.0)
   gitlab-mail_room (~> 0.0.9)
@@ -1492,7 +1492,7 @@ DEPENDENCIES
   gitlab_omniauth-ldap (~> 2.1.1)
   gon (~> 6.4.0)
   google-api-client (~> 0.33)
-  google-protobuf (~> 3.17.1)
+  google-protobuf (~> 3.19.0)
   gpgme (~> 2.0.19)
   grape (~> 1.5.2)
   grape-entity (~> 0.10.0)
@@ -1502,7 +1502,7 @@ DEPENDENCIES
   graphlient (~> 0.4.0)
   graphql (~> 1.11.10)
   graphql-docs (~> 1.6.0)
-  grpc (~> 1.30.2)
+  grpc (~> 1.42.0)
   gssapi
   guard-rspec
   haml_lint (~> 0.36.0)

app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue

@@ -31,7 +31,8 @@ export default {
   props: {
     groupId: {
       type: Number,
-      required: true,
+      required: false,
+      default: null,
     },
     groupNamespace: {
       type: String,
@@ -57,6 +58,11 @@ export default {
       required: false,
       default: () => [],
     },
+    loadingDefaultProjects: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -111,6 +117,9 @@ export default {
     searchTerm() {
       this.search();
     },
+    defaultProjects(projects) {
+      this.selectedProjects = [...projects];
+    },
   },
   mounted() {
     this.search();
@@ -202,6 +211,7 @@ export default {
     ref="projectsDropdown"
     class="dropdown dropdown-projects"
     toggle-class="gl-shadow-none"
+    :loading="loadingDefaultProjects"
     :show-clear-all="hasSelectedProjects"
     show-highlighted-items-title
     highlighted-items-title-class="gl-p-3"
@@ -209,6 +219,7 @@ export default {
     @hide="onHide"
   >
     <template #button-content>
+      <gl-loading-icon v-if="loadingDefaultProjects" class="gl-mr-2" />
       <div class="gl-display-flex gl-flex-grow-1">
         <gl-avatar
           v-if="isOnlyOneProjectSelected"

app/assets/javascripts/behaviors/markdown/render_sandboxed_mermaid.js

@@ -91,6 +91,7 @@ function renderMermaidEl(el, source) {
     sandbox: 'allow-scripts',
     frameBorder: 0,
     scrolling: 'no',
+    width: '100%',
   });
 
   // Add the original source into the DOM
@@ -119,7 +120,6 @@ function renderMermaidEl(el, source) {
         return;
       }
       const { h } = event.data;
-      iframeEl.width = '100%';
       iframeEl.height = `${h + BUFFER_IFRAME_HEIGHT}px`;
     },
     false,

app/assets/javascripts/boards/components/board_content_sidebar.vue

@@ -6,11 +6,12 @@ import SidebarDropdownWidget from 'ee_else_ce/sidebar/components/sidebar_dropdow
 import { __, sprintf } from '~/locale';
 import BoardSidebarTimeTracker from '~/boards/components/sidebar/board_sidebar_time_tracker.vue';
 import BoardSidebarTitle from '~/boards/components/sidebar/board_sidebar_title.vue';
-import { ISSUABLE } from '~/boards/constants';
+import { ISSUABLE, INCIDENT } from '~/boards/constants';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import SidebarAssigneesWidget from '~/sidebar/components/assignees/sidebar_assignees_widget.vue';
 import SidebarConfidentialityWidget from '~/sidebar/components/confidential/sidebar_confidentiality_widget.vue';
 import SidebarDateWidget from '~/sidebar/components/date/sidebar_date_widget.vue';
+import SidebarSeverity from '~/sidebar/components/severity/sidebar_severity.vue';
 import SidebarSubscriptionsWidget from '~/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue';
 import SidebarTodoWidget from '~/sidebar/components/todo_toggle/sidebar_todo_widget.vue';
 import SidebarLabelsWidget from '~/vue_shared/components/sidebar/labels_select_widget/labels_select_root.vue';
@@ -29,6 +30,7 @@ export default {
     SidebarSubscriptionsWidget,
     SidebarDropdownWidget,
     SidebarTodoWidget,
+    SidebarSeverity,
     MountingPortal,
     SidebarWeightWidget: () =>
       import('ee_component/sidebar/components/weight/sidebar_weight_widget.vue'),
@@ -69,9 +71,15 @@ export default {
     isIssuableSidebar() {
       return this.sidebarType === ISSUABLE;
     },
+    isIncidentSidebar() {
+      return this.activeBoardItem.type === INCIDENT;
+    },
     showSidebar() {
       return this.isIssuableSidebar && this.isSidebarOpen;
     },
+    sidebarTitle() {
+      return this.isIncidentSidebar ? __('Incident details') : __('Issue details');
+    },
     fullPath() {
       return this.activeBoardItem?.referencePath?.split('#')[0] || '';
     },
@@ -138,7 +146,7 @@ export default {
       @close="handleClose"
     >
       <template #title>
-        <h2 class="gl-my-0 gl-font-size-h2 gl-line-height-24">{{ __('Issue details') }}</h2>
+        <h2 class="gl-my-0 gl-font-size-h2 gl-line-height-24">{{ sidebarTitle }}</h2>
       </template>
       <template #header>
         <sidebar-todo-widget
@@ -159,7 +167,7 @@ export default {
           @assignees-updated="setAssignees"
         />
         <sidebar-dropdown-widget
-          v-if="epicFeatureAvailable"
+          v-if="epicFeatureAvailable && !isIncidentSidebar"
           :iid="activeBoardItem.iid"
           issuable-attribute="epic"
           :workspace-path="projectPathForActiveIssue"
@@ -178,7 +186,7 @@ export default {
           />
           <template v-if="!glFeatures.iterationCadences">
             <sidebar-dropdown-widget
-              v-if="iterationFeatureAvailable"
+              v-if="iterationFeatureAvailable && !isIncidentSidebar"
               :iid="activeBoardItem.iid"
               issuable-attribute="iteration"
               :workspace-path="projectPathForActiveIssue"
@@ -190,7 +198,7 @@ export default {
           </template>
           <template v-else>
             <iteration-sidebar-dropdown-widget
-              v-if="iterationFeatureAvailable"
+              v-if="iterationFeatureAvailable && !isIncidentSidebar"
               :iid="activeBoardItem.iid"
               :workspace-path="projectPathForActiveIssue"
               :attr-workspace-path="groupPathForActiveIssue"
@@ -226,8 +234,14 @@ export default {
         >
           {{ __('None') }}
         </sidebar-labels-widget>
+        <sidebar-severity
+          v-if="isIncidentSidebar"
+          :iid="activeBoardItem.iid"
+          :project-path="fullPath"
+          :initial-severity="activeBoardItem.severity"
+        />
         <sidebar-weight-widget
-          v-if="weightFeatureAvailable"
+          v-if="weightFeatureAvailable && !isIncidentSidebar"
           :iid="activeBoardItem.iid"
           :full-path="fullPath"
           :issuable-type="issuableType"

app/assets/javascripts/boards/constants.js

@@ -54,6 +54,7 @@ export const inactiveId = 0;
 
 export const ISSUABLE = 'issuable';
 export const LIST = 'list';
+export const INCIDENT = 'INCIDENT';
 
 export const flashAnimationDuration = 2000;
 

app/assets/javascripts/boards/graphql/issue.fragment.graphql

-#import "~/graphql_shared/fragments/milestone.fragment.graphql"
-#import "~/graphql_shared/fragments/user.fragment.graphql"
+#import "~/graphql_shared/fragments/issue.fragment.graphql"
 
-fragment IssueNode on Issue {
+fragment Issue on Issue {
   id
-  iid
-  title
-  referencePath: reference(full: true)
-  dueDate
-  timeEstimate
-  totalTimeSpent
-  humanTimeEstimate
-  humanTotalTimeSpent
-  emailsDisabled
-  confidential
-  hidden
-  webUrl
-  relativePosition
-  milestone {
-    ...MilestoneFragment
-  }
-  assignees {
-    nodes {
-      ...User
-    }
-  }
-  labels {
-    nodes {
-      id
-      title
-      color
-      description
-    }
-  }
+  ...IssueNode
 }

app/assets/javascripts/boards/graphql/issue_create.mutation.graphql

@@ -3,7 +3,7 @@
 mutation CreateIssue($input: CreateIssueInput!) {
   createIssue(input: $input) {
     issue {
-      ...IssueNode
+      ...Issue
     }
     errors
   }

app/assets/javascripts/boards/graphql/issue_move_list.mutation.graphql

@@ -21,7 +21,7 @@ mutation issueMoveList(
     }
   ) {
     issue {
-      ...IssueNode
+      ...Issue
     }
     errors
   }

app/assets/javascripts/boards/graphql/lists_issues.query.graphql

@@ -22,7 +22,7 @@ query BoardListsEE(
           issues(first: $first, filters: $filters, after: $after) {
             edges {
               node {
-                ...IssueNode
+                ...Issue
               }
             }
             pageInfo {
@@ -46,7 +46,7 @@ query BoardListsEE(
           issues(first: $first, filters: $filters, after: $after) {
             edges {
               node {
-                ...IssueNode
+                ...Issue
               }
             }
             pageInfo {

app/assets/javascripts/branches/branches_delete_modal.js

-import $ from 'jquery';
-
-const MODAL_SELECTOR = '#modal-delete-branch';
-
-class DeleteModal {
-  constructor() {
-    this.$modal = $(MODAL_SELECTOR);
-    this.$toggleBtns = $(`[data-target="${MODAL_SELECTOR}"]`);
-    this.$branchName = $('.js-branch-name', this.$modal);
-    this.$confirmInput = $('.js-delete-branch-input', this.$modal);
-    this.$deleteBtn = $('.js-delete-branch', this.$modal);
-    this.$notMerged = $('.js-not-merged', this.$modal);
-    this.bindEvents();
-  }
-
-  bindEvents() {
-    this.$toggleBtns.on('click', this.setModalData.bind(this));
-    this.$confirmInput.on('input', this.setDeleteDisabled.bind(this));
-    this.$deleteBtn.on('click', this.setDisableDeleteButton.bind(this));
-  }
-
-  setModalData(e) {
-    const branchData = e.currentTarget.dataset;
-    this.branchName = branchData.branchName || '';
-    this.deletePath = branchData.deletePath || '';
-    this.isMerged = Boolean(branchData.isMerged);
-    this.updateModal();
-  }
-
-  setDeleteDisabled(e) {
-    this.$deleteBtn.attr('disabled', e.currentTarget.value !== this.branchName);
-  }
-
-  setDisableDeleteButton(e) {
-    if (this.$deleteBtn.is('[disabled]')) {
-      e.preventDefault();
-      e.stopPropagation();
-      return false;
-    }
-
-    return true;
-  }
-
-  updateModal() {
-    this.$branchName.text(this.branchName);
-    this.$confirmInput.val('');
-    this.$deleteBtn.attr('href', this.deletePath);
-    this.$deleteBtn.attr('disabled', true);
-    this.$notMerged.toggleClass('hidden', this.isMerged);
-  }
-}
-
-export default DeleteModal;

app/assets/javascripts/clusters/agents/components/show.vue

@@ -122,12 +122,12 @@ export default {
       </p>
 
       <gl-tabs sync-active-tab-with-query-params lazy>
-        <slot name="ee-security-tab" :cluster-agent-id="clusterAgent.id"></slot>
-
         <gl-tab :title="$options.i18n.activity" query-param-value="activity">
           <activity-events :agent-name="agentName" :project-path="projectPath" />
         </gl-tab>
 
+        <slot name="ee-security-tab" :cluster-agent-id="clusterAgent.id"></slot>
+
         <gl-tab query-param-value="tokens">
           <template #title>
             <span data-testid="cluster-agent-token-count">

app/assets/javascripts/google_tag_manager/index.js

@@ -82,7 +82,7 @@ export const trackSaasTrialGroup = () => {
     return;
   }
 
-  const form = document.getElementById('new_group');
+  const form = document.querySelector('.js-saas-trial-group');
   form.addEventListener('submit', () => {
     pushEvent('saasTrialGroup');
   });

app/assets/javascripts/graphql_shared/fragments/issue.fragment.graphql

+#import "~/graphql_shared/fragments/milestone.fragment.graphql"
+#import "~/graphql_shared/fragments/user.fragment.graphql"
+
+fragment IssueNode on Issue {
+  id
+  iid
+  title
+  referencePath: reference(full: true)
+  dueDate
+  timeEstimate
+  totalTimeSpent
+  humanTimeEstimate
+  humanTotalTimeSpent
+  emailsDisabled
+  confidential
+  hidden
+  webUrl
+  relativePosition
+  type
+  severity
+  milestone {
+    ...MilestoneFragment
+  }
+  assignees {
+    nodes {
+      ...User
+    }
+  }
+  labels {
+    nodes {
+      id
+      title
+      color
+      description
+    }
+  }
+}

app/assets/javascripts/jobs/bridge/components/sidebar.vue

 <script>
 import { GlButton, GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import { __ } from '~/locale';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue';
 import { JOB_SIDEBAR } from '../../constants';
 import CommitBlock from '../../components/commit_block.vue';
@@ -25,6 +26,7 @@ export default {
     GlDropdownItem,
     TooltipOnTruncate,
   },
+  mixins: [glFeatureFlagsMixin()],
   props: {
     bridgeJob: {
       type: Object,
@@ -54,7 +56,10 @@ export default {
         </h4>
       </tooltip-on-truncate>
       <!-- TODO: implement retry actions -->
-      <div class="gl-flex-grow-1 gl-flex-shrink-0 gl-text-right">
+      <div
+        v-if="glFeatures.triggerJobRetryAction"
+        class="gl-flex-grow-1 gl-flex-shrink-0 gl-text-right"
+      >
         <gl-dropdown
           :text="$options.i18n.retryButton"
           category="primary"