Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/CODEOWNERS

@@ -280,3 +280,6 @@ Dangerfile @gl-quality/eng-prod
 
 [Legal]
 /config/dependency_decisions.yml @gitlab-org/legal-reviewers
+
+[Workhorse]
+/workhorse/ @jacobvosmaer-gitlab @nick.thomas @nolith @patrickbajao 

.gitlab/ci/workhorse.gitlab-ci.yml

@@ -1,20 +1,10 @@
-workhorse:
-  extends: .workhorse:rules:workhorse
-  image: ${GITLAB_DEPENDENCY_PROXY}golang:1.14
-  stage: test
-  needs: []
-  script:
-    - rm .git/hooks/post-checkout
-    - git checkout .
-    - scripts/update-workhorse check
-    - make -C workhorse
-
 workhorse:verify:
   extends: .workhorse:rules:workhorse
   image: ${GITLAB_DEPENDENCY_PROXY}golang:1.15
   stage: test
   needs: []
   script:
+    - make -C workhorse # test build
     - make -C workhorse verify
 
 .workhorse:test:

.rubocop_manual_todo.yml

@@ -2512,8 +2512,3 @@ Style/HashTransformation:
     - 'spec/support/helpers/graphql_helpers.rb'
     - 'spec/support/import_export/project_tree_expectations.rb'
     - 'spec/support/shared_contexts/services/projects/container_repository/delete_tags_service_shared_context.rb'
-
-Style/ClassEqualityComparison:
-  Exclude:
-    - spec/lib/peek/views/active_record_spec.rb
-    - ee/spec/lib/peek/views/active_record_spec.rb

GITLAB_WORKHORSE_VERSION

@@ -0,0 +1 @@
+VERSION

GITLAB_WORKHORSE_VERSION

@@ -120,7 +120,7 @@ gem 'fog-aws', '~> 3.9'
 # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
 # Also see config/initializers/fog_core_patch.rb.
 gem 'fog-core', '= 2.1.0'
-gem 'fog-google', '~> 1.12'
+gem 'gitlab-fog-google', '~> 1.13', require: 'fog/google'
 gem 'fog-local', '~> 0.6'
 gem 'fog-openstack', '~> 1.0'
 gem 'fog-rackspace', '~> 0.1.1'

Gemfile

@@ -383,12 +383,6 @@ GEM
       excon (~> 0.58)
       formatador (~> 0.2)
       mime-types
-    fog-google (1.12.0)
-      fog-core (<= 2.1.0)
-      fog-json (~> 1.2)
-      fog-xml (~> 0.1.0)
-      google-api-client (>= 0.44.2, < 0.51)
-      google-cloud-env (~> 1.2)
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
@@ -446,6 +440,13 @@ GEM
       fog-json (~> 1.2.0)
       mime-types
       ms_rest_azure (~> 0.12.0)
+    gitlab-fog-google (1.13.0)
+      addressable (>= 2.7.0)
+      fog-core (<= 2.1.0)
+      fog-json (~> 1.2)
+      fog-xml (~> 0.1.0)
+      google-api-client (>= 0.44.2, < 0.51)
+      google-cloud-env (~> 1.2)
     gitlab-labkit (0.16.0)
       actionpack (>= 5.0.0, < 7.0.0)
       activesupport (>= 5.0.0, < 7.0.0)
@@ -1400,7 +1401,6 @@ DEPENDENCIES
   fog-aliyun (~> 0.3)
   fog-aws (~> 3.9)
   fog-core (= 2.1.0)
-  fog-google (~> 1.12)
   fog-local (~> 0.6)
   fog-openstack (~> 1.0)
   fog-rackspace (~> 0.1.1)
@@ -1415,6 +1415,7 @@ DEPENDENCIES
   gitlab-chronic (~> 0.10.5)
   gitlab-experiment (~> 0.4.12)
   gitlab-fog-azure-rm (~> 1.0.1)
+  gitlab-fog-google (~> 1.13)
   gitlab-labkit (~> 0.16.0)
   gitlab-license (~> 1.3)
   gitlab-mail_room (~> 0.0.8)

Gemfile.lock

@@ -41,7 +41,7 @@ export default {
 </script>
 
 <template>
-  <gl-modal :modal-id="modalId" body-class="gl-p-0!">
+  <gl-modal :modal-id="modalId" body-class="gl-p-0!" data-qa-selector="export_issuable_modal">
     <template #modal-title>
       <gl-sprintf :message="__('Export %{name}')">
         <template #name>{{ issuableName }}</template>

app/assets/javascripts/issuable/components/csv_export_modal.vue

@@ -60,11 +60,13 @@ export default {
         v-gl-tooltip.hover="__('Export as CSV')"
         v-gl-modal="exportModalId"
         icon="export"
+        data-qa-selector="export_as_csv_button"
         data-testid="export-csv-button"
       />
       <gl-dropdown
         v-if="showImportButton"
         v-gl-tooltip.hover="__('Import issues')"
+        data-qa-selector="import_issues_dropdown"
         data-testid="import-csv-dropdown"
         icon="import"
       >

app/assets/javascripts/issuable/components/csv_import_export_buttons.vue

@@ -0,0 +1,15 @@
+<script>
+export default {
+  name: 'IssuableDiscussion',
+};
+</script>
+
+<template>
+  <section class="issuable-discussion">
+    <div>
+      <ul class="notes main-notes-list timeline">
+        <slot name="discussion"></slot>
+      </ul>
+    </div>
+  </section>
+</template>

app/assets/javascripts/issuable_show/components/issuable_discussion.vue

@@ -2,13 +2,15 @@
 import IssuableSidebar from '~/issuable_sidebar/components/issuable_sidebar_root.vue';
 
 import IssuableBody from './issuable_body.vue';
+import IssuableDiscussion from './issuable_discussion.vue';
 import IssuableHeader from './issuable_header.vue';
 
 export default {
   components: {
     IssuableSidebar,
     IssuableHeader,
     IssuableBody,
+    IssuableDiscussion,
   },
   props: {
     issuable: {
@@ -89,6 +91,7 @@ export default {
         <slot name="header-actions"></slot>
       </template>
     </issuable-header>
+
     <issuable-body
       :issuable="issuable"
       :status-badge-class="statusBadgeClass"
@@ -111,6 +114,13 @@ export default {
         <slot name="edit-form-actions" v-bind="actionsProps"></slot>
       </template>
     </issuable-body>
+
+    <issuable-discussion>
+      <template #discussion>
+        <slot name="discussion"></slot>
+      </template>
+    </issuable-discussion>
+
     <issuable-sidebar @sidebar-toggle="$emit('sidebar-toggle', $event)">
       <template #right-sidebar-items="sidebarProps">
         <slot name="right-sidebar-items" v-bind="sidebarProps"></slot>

app/assets/javascripts/issuable_show/components/issuable_show_root.vue

@@ -37,7 +37,7 @@ export default {
 };
 </script>
 <template>
-  <div class="block">
+  <div>
     <div class="title gl-font-weight-bold">{{ s__('Job|Job artifacts') }}</div>
     <p
       v-if="isExpired || willExpire"

app/assets/javascripts/jobs/components/artifacts_block.vue

@@ -18,20 +18,11 @@ export default {
       required: false,
       default: null,
     },
-    isLastBlock: {
-      type: Boolean,
-      required: true,
-    },
   },
 };
 </script>
 <template>
-  <div
-    :class="{
-      'block-last': isLastBlock,
-      block: !isLastBlock,
-    }"
-  >
+  <div>
     <span class="font-weight-bold">{{ __('Commit') }}</span>
 
     <gl-link :href="commit.commit_path" class="js-commit-sha commit-sha link-commit">

app/assets/javascripts/jobs/components/commit_block.vue

@@ -20,6 +20,7 @@ export default {
   i18n: {
     ...JOB_SIDEBAR,
   },
+  borderTopClass: ['gl-border-t-solid', 'gl-border-t-1', 'gl-border-t-gray-100'],
   forwardDeploymentFailureModalId,
   components: {
     ArtifactsBlock,
@@ -72,7 +73,7 @@ export default {
   <aside class="right-sidebar build-sidebar" data-offset-top="101" data-spy="affix">
     <div class="sidebar-container">
       <div class="blocks-container">
-        <div class="block gl-display-flex gl-flex-nowrap gl-align-items-center">
+        <div class="gl-py-5 gl-display-flex gl-align-items-center">
           <tooltip-on-truncate :title="job.name" truncate-target="child"
             ><h4 class="my-0 mr-2 gl-text-truncate">
               {{ job.name }}
@@ -107,38 +108,59 @@ export default {
           />
         </div>
 
-        <div v-if="job.terminal_path || job.new_issue_path" class="block retry-link">
+        <div
+          v-if="job.terminal_path || job.new_issue_path"
+          class="gl-py-5"
+          :class="$options.borderTopClass"
+        >
           <gl-button
             v-if="job.new_issue_path"
+            :href="job.new_issue_path"
             category="secondary"
             variant="confirm"
-            :href="job.new_issue_path"
-            class="float-left gl-mr-2"
             data-testid="job-new-issue"
-            >{{ $options.i18n.newIssue }}
+          >
+            {{ $options.i18n.newIssue }}
           </gl-button>
           <gl-button
             v-if="job.terminal_path"
             :href="job.terminal_path"
-            class="gl-md-display-block gl-lg-display-block float-left"
             target="_blank"
             data-testid="terminal-link"
           >
             {{ $options.i18n.debug }}
-            <gl-icon :size="14" name="external-link" />
+            <gl-icon name="external-link" />
           </gl-button>
         </div>
-        <job-sidebar-details-container />
-        <artifacts-block v-if="hasArtifact" :artifact="job.artifact" :help-url="artifactHelpUrl" />
-        <trigger-block v-if="hasTriggers" :trigger="job.trigger" />
+
+        <job-sidebar-details-container class="gl-py-5" :class="$options.borderTopClass" />
+
+        <artifacts-block
+          v-if="hasArtifact"
+          class="gl-py-5"
+          :class="$options.borderTopClass"
+          :artifact="job.artifact"
+          :help-url="artifactHelpUrl"
+        />
+
+        <trigger-block
+          v-if="hasTriggers"
+          class="gl-py-5"
+          :class="$options.borderTopClass"
+          :trigger="job.trigger"
+        />
+
         <commit-block
           :commit="commit"
-          :is-last-block="hasStages"
+          class="gl-py-5"
+          :class="$options.borderTopClass"
           :merge-request="job.merge_request"
         />
 
         <stages-dropdown
           v-if="job.pipeline"
+          class="gl-py-5"
+          :class="$options.borderTopClass"
           :pipeline="job.pipeline"
           :selected-stage="selectedStage"
           :stages="stages"

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

@@ -73,7 +73,7 @@ export default {
 </script>
 
 <template>
-  <div v-if="shouldRenderBlock" class="block">
+  <div v-if="shouldRenderBlock">
     <detail-row v-if="job.duration" :value="duration" title="Duration" />
     <detail-row
       v-if="job.finished_at"

app/assets/javascripts/jobs/components/sidebar_job_details_container.vue

@@ -43,7 +43,7 @@ export default {
 };
 </script>
 <template>
-  <div class="block-last dropdown">
+  <div class="dropdown">
     <div class="js-pipeline-info">
       <ci-icon :status="pipeline.details.status" class="vertical-align-middle" />
 

app/assets/javascripts/jobs/components/stages_dropdown.vue

@@ -61,7 +61,7 @@ export default {
 </script>
 
 <template>
-  <div class="block">
+  <div>
     <p
       v-if="trigger.short_token"
       :class="{ 'gl-mb-2': hasVariables, 'gl-mb-0': !hasVariables }"

app/assets/javascripts/jobs/components/trigger_block.vue

@@ -0,0 +1,54 @@
+<script>
+import PipelineStage from '~/pipelines/components/pipelines_list/pipeline_stage.vue';
+/**
+ * Renders the pipeline mini graph.
+ */
+export default {
+  components: {
+    PipelineStage,
+  },
+  props: {
+    stages: {
+      type: Array,
+      required: true,
+    },
+    updateDropdown: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    stagesClass: {
+      type: [Array, Object, String],
+      required: false,
+      default: '',
+    },
+    isMergeTrain: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
+  methods: {
+    onPipelineActionRequestComplete() {
+      this.$emit('pipelineActionRequestComplete');
+    },
+  },
+};
+</script>
+<template>
+  <div data-testid="widget-mini-pipeline-graph">
+    <div
+      v-for="stage in stages"
+      :key="stage.name"
+      :class="stagesClass"
+      class="stage-container dropdown"
+    >
+      <pipeline-stage
+        :stage="stage"
+        :update-dropdown="updateDropdown"
+        :is-merge-train="isMergeTrain"
+        @pipelineActionRequestComplete="onPipelineActionRequestComplete"
+      />
+    </div>
+  </div>
+</template>

app/assets/javascripts/pipelines/components/pipelines_list/pipeline_mini_graph.vue

@@ -11,6 +11,7 @@
  * 3. Merge request widget
  * 4. Commit widget
  */
+
 import { GlDropdown, GlLoadingIcon, GlTooltipDirective, GlIcon } from '@gitlab/ui';
 import { deprecatedCreateFlash as Flash } from '~/flash';
 import axios from '~/lib/utils/axios_utils';