From f675c7d41d6b934d5b34998160b0ea95cc30598b Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 7 Sep 2020 06:08:35 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../boards/components/modal/footer.vue          | 10 ++++++----
 .../jobs/components/artifacts_block.vue         | 15 ++++++++++++++-
 .../javascripts/jobs/components/job_app.vue     |  6 ++++++
 .../javascripts/jobs/components/sidebar.vue     |  7 ++++++-
 app/assets/javascripts/jobs/index.js            |  2 ++
 .../new/components/fork_groups_list_item.vue    |  5 +++--
 app/assets/stylesheets/framework/tables.scss    |  2 +-
 app/helpers/ci/jobs_helper.rb                   |  1 +
 .../233425-add-artifact-expiration-help-url.yml |  5 +++++
 changelogs/unreleased/241851-Replace-v-html.yml |  5 +++++
 lib/object_storage/direct_upload.rb             | 11 +++++++----
 .../jobs/components/artifacts_block_spec.js     | 17 ++++++++++++++++-
 spec/frontend/jobs/components/job_app_spec.js   |  1 +
 spec/lib/backup/repository_spec.rb              |  2 +-
 spec/lib/object_storage/direct_upload_spec.rb   |  5 +++--
 15 files changed, 77 insertions(+), 17 deletions(-)
 create mode 100644 changelogs/unreleased/233425-add-artifact-expiration-help-url.yml
 create mode 100644 changelogs/unreleased/241851-Replace-v-html.yml

diff --git a/app/assets/javascripts/boards/components/modal/footer.vue b/app/assets/javascripts/boards/components/modal/footer.vue
index c4953dda793..d28a03da97f 100644
--- a/app/assets/javascripts/boards/components/modal/footer.vue
+++ b/app/assets/javascripts/boards/components/modal/footer.vue
@@ -1,4 +1,5 @@
 <script>
+import { GlButton } from '@gitlab/ui';
 import footerEEMixin from 'ee_else_ce/boards/mixins/modal_footer';
 import { deprecatedCreateFlash as Flash } from '../../../flash';
 import { __, n__ } from '../../../locale';
@@ -10,6 +11,7 @@ import boardsStore from '../../stores/boards_store';
 export default {
   components: {
     ListsDropdown,
+    GlButton,
   },
   mixins: [modalMixin, footerEEMixin],
   data() {
@@ -65,14 +67,14 @@ export default {
 <template>
   <footer class="form-actions add-issues-footer">
     <div class="float-left">
-      <button :disabled="submitDisabled" class="btn btn-success" type="button" @click="addIssues">
+      <gl-button :disabled="submitDisabled" category="primary" variant="success" @click="addIssues">
         {{ submitText }}
-      </button>
+      </gl-button>
       <span class="inline add-issues-footer-to-list">{{ __('to list') }}</span>
       <lists-dropdown />
     </div>
-    <button class="btn btn-default float-right" type="button" @click="toggleModal(false)">
+    <gl-button class="float-right" @click="toggleModal(false)">
       {{ __('Cancel') }}
-    </button>
+    </gl-button>
   </footer>
 </template>
diff --git a/app/assets/javascripts/jobs/components/artifacts_block.vue b/app/assets/javascripts/jobs/components/artifacts_block.vue
index 396bf3a824e..2850a8e86fd 100644
--- a/app/assets/javascripts/jobs/components/artifacts_block.vue
+++ b/app/assets/javascripts/jobs/components/artifacts_block.vue
@@ -1,11 +1,12 @@
 <script>
-import { GlLink } from '@gitlab/ui';
+import { GlIcon, GlLink } from '@gitlab/ui';
 import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
 
 export default {
   components: {
     TimeagoTooltip,
+    GlIcon,
     GlLink,
   },
   mixins: [timeagoMixin],
@@ -14,6 +15,10 @@ export default {
       type: Object,
       required: true,
     },
+    helpUrl: {
+      type: String,
+      required: true,
+    },
   },
   computed: {
     isExpired() {
@@ -40,6 +45,14 @@ export default {
       <span v-if="isExpired">{{ s__('Job|The artifacts were removed') }}</span>
       <span v-if="willExpire">{{ s__('Job|The artifacts will be removed') }}</span>
       <timeago-tooltip v-if="artifact.expire_at" :time="artifact.expire_at" />
+      <gl-link
+        :href="helpUrl"
+        target="_blank"
+        rel="noopener noreferrer nofollow"
+        data-testid="artifact-expired-help-link"
+      >
+        <gl-icon name="question" />
+      </gl-link>
     </p>
     <p v-else-if="isLocked" class="build-detail-row">
       <span data-testid="job-locked-message">{{
diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue
index 7a7da977c93..00ff3fb939d 100644
--- a/app/assets/javascripts/jobs/components/job_app.vue
+++ b/app/assets/javascripts/jobs/components/job_app.vue
@@ -38,6 +38,11 @@ export default {
   },
   mixins: [delayedJobMixin],
   props: {
+    artifactHelpUrl: {
+      type: String,
+      required: false,
+      default: '',
+    },
     runnerSettingsUrl: {
       type: String,
       required: false,
@@ -319,6 +324,7 @@ export default {
         'right-sidebar-expanded': isSidebarOpen,
         'right-sidebar-collapsed': !isSidebarOpen,
       }"
+      :artifact-help-url="artifactHelpUrl"
       :runner-help-url="runnerHelpUrl"
       data-testid="job-sidebar"
     />
diff --git a/app/assets/javascripts/jobs/components/sidebar.vue b/app/assets/javascripts/jobs/components/sidebar.vue
index a6b6a4f1d5f..aa589989e8a 100644
--- a/app/assets/javascripts/jobs/components/sidebar.vue
+++ b/app/assets/javascripts/jobs/components/sidebar.vue
@@ -29,6 +29,11 @@ export default {
   },
   mixins: [timeagoMixin],
   props: {
+    artifactHelpUrl: {
+      type: String,
+      required: false,
+      default: '',
+    },
     runnerHelpUrl: {
       type: String,
       required: false,
@@ -208,7 +213,7 @@ export default {
           </p>
         </div>
 
-        <artifacts-block v-if="hasArtifact" :artifact="job.artifact" />
+        <artifacts-block v-if="hasArtifact" :artifact="job.artifact" :help-url="artifactHelpUrl" />
         <trigger-block v-if="hasTriggers" :trigger="job.trigger" />
         <commit-block
           :is-last-block="hasStages"
diff --git a/app/assets/javascripts/jobs/index.js b/app/assets/javascripts/jobs/index.js
index 024a13ce102..6e15360b66c 100644
--- a/app/assets/javascripts/jobs/index.js
+++ b/app/assets/javascripts/jobs/index.js
@@ -18,6 +18,7 @@ export default () => {
     },
     render(createElement) {
       const {
+        artifactHelpUrl,
         deploymentHelpUrl,
         runnerHelpUrl,
         runnerSettingsUrl,
@@ -32,6 +33,7 @@ export default () => {
 
       return createElement('job-app', {
         props: {
+          artifactHelpUrl,
           deploymentHelpUrl,
           runnerHelpUrl,
           runnerSettingsUrl,
diff --git a/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list_item.vue b/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list_item.vue
index 35ec9c240d1..57838050d55 100644
--- a/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list_item.vue
+++ b/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list_item.vue
@@ -1,5 +1,4 @@
 <script>
-/* eslint-disable vue/no-v-html */
 import {
   GlLink,
   GlButton,
@@ -8,6 +7,7 @@ import {
   GlTooltipDirective,
   GlTooltip,
   GlBadge,
+  GlSafeHtmlDirective as SafeHtml,
 } from '@gitlab/ui';
 import { VISIBILITY_TYPE_ICON, GROUP_VISIBILITY_TYPE } from '~/groups/constants';
 import { __ } from '~/locale';
@@ -24,6 +24,7 @@ export default {
   },
   directives: {
     GlTooltip: GlTooltipDirective,
+    SafeHtml,
   },
   props: {
     group: {
@@ -120,7 +121,7 @@ export default {
             </span>
           </div>
           <div v-if="group.description" class="description">
-            <span v-html="group.markdown_description"> </span>
+            <span v-safe-html="group.markdown_description"> </span>
           </div>
         </div>
         <div class="gl-display-flex gl-flex-shrink-0">
diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss
index 2924dd3bf61..312158bd3c9 100644
--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
@@ -198,7 +198,7 @@ table {
     }
 
     .severity {
-      width: 9%;
+      width: 10%;
     }
 
     .identifier {
diff --git a/app/helpers/ci/jobs_helper.rb b/app/helpers/ci/jobs_helper.rb
index 0344413b849..e876eb64029 100644
--- a/app/helpers/ci/jobs_helper.rb
+++ b/app/helpers/ci/jobs_helper.rb
@@ -6,6 +6,7 @@ module Ci
       {
         "endpoint" => project_job_path(@project, @build, format: :json),
         "project_path" => @project.full_path,
+        "artifact_help_url" => help_page_path('user/gitlab_com/index.html', anchor: 'gitlab-cicd'),
         "deployment_help_url" => help_page_path('user/project/clusters/index.html', anchor: 'troubleshooting'),
         "runner_help_url" => help_page_path('ci/runners/README.html', anchor: 'set-maximum-job-timeout-for-a-runner'),
         "runner_settings_url" => project_runners_path(@build.project, anchor: 'js-runners-settings'),
diff --git a/changelogs/unreleased/233425-add-artifact-expiration-help-url.yml b/changelogs/unreleased/233425-add-artifact-expiration-help-url.yml
new file mode 100644
index 00000000000..1876b2c6812
--- /dev/null
+++ b/changelogs/unreleased/233425-add-artifact-expiration-help-url.yml
@@ -0,0 +1,5 @@
+---
+title: Add the artifact expiration help url
+merge_request: 39546
+author: Gilang Gumilar
+type: added
diff --git a/changelogs/unreleased/241851-Replace-v-html.yml b/changelogs/unreleased/241851-Replace-v-html.yml
new file mode 100644
index 00000000000..6ddfbda69c5
--- /dev/null
+++ b/changelogs/unreleased/241851-Replace-v-html.yml
@@ -0,0 +1,5 @@
+---
+title: Replace v-html with v-safe-html in fork_groups_list_item.vue
+merge_request: 41143
+author: Kev @KevSlashNull
+type: other
diff --git a/lib/object_storage/direct_upload.rb b/lib/object_storage/direct_upload.rb
index 75d6cdb8912..b5864382299 100644
--- a/lib/object_storage/direct_upload.rb
+++ b/lib/object_storage/direct_upload.rb
@@ -98,16 +98,19 @@ module ObjectStorage
         RemoteTempObjectID: object_name,
         ObjectStorage: {
           Provider: 'AzureRM',
-          AzureConfig: {
-            StorageDomain: config.azure_storage_domain
-          },
           GoCloudConfig: {
-            URL: "azblob://#{bucket_name}"
+            URL: azure_gocloud_url
           }
         }
       }
     end
 
+    def azure_gocloud_url
+      url = "azblob://#{bucket_name}"
+      url += "?domain=#{config.azure_storage_domain}" if config.azure_storage_domain.present?
+      url
+    end
+
     def use_workhorse_s3_client?
       return false unless Feature.enabled?(:use_workhorse_s3_client, default_enabled: true)
       return false unless config.use_iam_profile? || config.consolidated_settings?
diff --git a/spec/frontend/jobs/components/artifacts_block_spec.js b/spec/frontend/jobs/components/artifacts_block_spec.js
index 11bd645916e..a709a59cadd 100644
--- a/spec/frontend/jobs/components/artifacts_block_spec.js
+++ b/spec/frontend/jobs/components/artifacts_block_spec.js
@@ -8,7 +8,10 @@ describe('Artifacts block', () => {
 
   const createWrapper = propsData =>
     mount(ArtifactsBlock, {
-      propsData,
+      propsData: {
+        helpUrl: 'help-url',
+        ...propsData,
+      },
     });
 
   const findArtifactRemoveElt = () => wrapper.find('[data-testid="artifacts-remove-timeline"]');
@@ -68,6 +71,12 @@ describe('Artifacts block', () => {
       expect(trimText(findArtifactRemoveElt().text())).toBe(
         `The artifacts were removed ${formattedDate}`,
       );
+
+      expect(
+        findArtifactRemoveElt()
+          .find('[data-testid="artifact-expired-help-link"]')
+          .attributes('href'),
+      ).toBe('help-url');
     });
 
     it('does not show the keep button', () => {
@@ -94,6 +103,12 @@ describe('Artifacts block', () => {
       expect(trimText(findArtifactRemoveElt().text())).toBe(
         `The artifacts will be removed ${formattedDate}`,
       );
+
+      expect(
+        findArtifactRemoveElt()
+          .find('[data-testid="artifact-expired-help-link"]')
+          .attributes('href'),
+      ).toBe('help-url');
     });
 
     it('renders the keep button', () => {
diff --git a/spec/frontend/jobs/components/job_app_spec.js b/spec/frontend/jobs/components/job_app_spec.js
index e9ecafcd4c3..94653d4d4c7 100644
--- a/spec/frontend/jobs/components/job_app_spec.js
+++ b/spec/frontend/jobs/components/job_app_spec.js
@@ -33,6 +33,7 @@ describe('Job App', () => {
   };
 
   const props = {
+    artifactHelpUrl: 'help/artifact',
     runnerHelpUrl: 'help/runner',
     deploymentHelpUrl: 'help/deployment',
     runnerSettingsUrl: 'settings/ci-cd/runners',
diff --git a/spec/lib/backup/repository_spec.rb b/spec/lib/backup/repository_spec.rb
index b8b0d66d8d8..718f38f9452 100644
--- a/spec/lib/backup/repository_spec.rb
+++ b/spec/lib/backup/repository_spec.rb
@@ -67,7 +67,7 @@ RSpec.describe Backup::Repository do
     end
 
     [4, 10].each do |max_storage_concurrency|
-      context "max_storage_concurrency #{max_storage_concurrency}" do
+      context "max_storage_concurrency #{max_storage_concurrency}", quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/241701' do
         it 'creates the expected number of threads' do
           expect(Thread).to receive(:new)
             .exactly(storage_keys.length * (max_storage_concurrency + 1)).times
diff --git a/spec/lib/object_storage/direct_upload_spec.rb b/spec/lib/object_storage/direct_upload_spec.rb
index f73cc1f73dc..932d579c3cc 100644
--- a/spec/lib/object_storage/direct_upload_spec.rb
+++ b/spec/lib/object_storage/direct_upload_spec.rb
@@ -211,8 +211,7 @@ RSpec.describe ObjectStorage::DirectUpload do
         expect(subject[:UseWorkhorseClient]).to be true
         expect(subject[:RemoteTempObjectID]).to eq(object_name)
         expect(subject[:ObjectStorage][:Provider]).to eq('AzureRM')
-        expect(subject[:ObjectStorage][:AzureConfig][:StorageDomain]).to eq(storage_domain)
-        expect(subject[:ObjectStorage][:GoCloudConfig]).to eq({ URL: "azblob://#{bucket_name}" })
+        expect(subject[:ObjectStorage][:GoCloudConfig]).to eq({ URL: gocloud_url })
       end
     end
 
@@ -399,6 +398,7 @@ RSpec.describe ObjectStorage::DirectUpload do
       let(:has_length) { false }
       let(:storage_domain) { nil }
       let(:storage_url) { 'https://azuretest.blob.core.windows.net' }
+      let(:gocloud_url) { "azblob://#{bucket_name}" }
 
       it_behaves_like 'a valid AzureRM upload'
       it_behaves_like 'a valid upload without multipart data'
@@ -406,6 +406,7 @@ RSpec.describe ObjectStorage::DirectUpload do
       context 'when a custom storage domain is used' do
         let(:storage_domain) { 'blob.core.chinacloudapi.cn' }
         let(:storage_url) { "https://azuretest.#{storage_domain}" }
+        let(:gocloud_url) { "azblob://#{bucket_name}?domain=#{storage_domain}" }
 
         before do
           credentials[:azure_storage_domain] = storage_domain
-- 
GitLab