From 1403e9bc459bcf37c9fdfb61aadd268d11b0abfd Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 27 Sep 2022 15:13:43 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../components/sidebar_editable_item.vue      |  2 +-
 .../time_tracking/sidebar_time_tracking.vue   |  2 +-
 .../stylesheets/framework/variables.scss      |  8 ----
 .../stylesheets/page_bundles/milestone.scss   |  2 +-
 app/assets/stylesheets/pages/issuable.scss    | 17 ++++++--
 app/models/ci/build.rb                        |  9 +++++
 app/models/ci/pipeline.rb                     |  4 ++
 .../pipeline_schedules/index.html.haml        |  5 ++-
 ...ipeline_success_unlock_artifacts_worker.rb |  4 +-
 package.json                                  |  2 +-
 .../gitlab_project_migration_common.rb        |  6 ++-
 .../states/mr_widget_ready_to_merge_spec.js   |  2 +-
 spec/models/ci/build_spec.rb                  | 36 +++++++++++++++++
 spec/models/ci/pipeline_spec.rb               | 39 +++++++++++++++++++
 .../sidebar_due_date_shared_examples.rb       |  2 +
 ...ne_success_unlock_artifacts_worker_spec.rb | 21 ++++++----
 tooling/config/CODEOWNERS.yml                 |  1 -
 yarn.lock                                     |  8 ++--
 18 files changed, 136 insertions(+), 34 deletions(-)

diff --git a/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue b/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue
index cc88812c7b0..e9d67d12329 100644
--- a/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue
+++ b/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue
@@ -125,7 +125,7 @@ export default {
 <template>
   <div>
     <div
-      class="gl-display-flex gl-align-items-center gl-line-height-20 gl-mb-2 gl-text-gray-900 gl-font-weight-bold"
+      class="gl-display-flex gl-align-items-center gl-line-height-20 gl-text-gray-900 gl-font-weight-bold"
       @click.self="collapse"
     >
       <span class="hide-collapsed" data-testid="title" @click="collapse">
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue b/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue
index d472b67d976..62b05421884 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue
@@ -61,7 +61,7 @@ export default {
 </script>
 
 <template>
-  <div class="block">
+  <div class="block time-tracking">
     <issuable-time-tracker
       :full-path="fullPath"
       :issuable-id="issuableId"
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index bd32a817d5d..0bca7ffb539 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -649,14 +649,6 @@ $calendar-hover-bg: #ecf3fe;
 $calendar-border-color: rgba(#000, 0.1);
 $calendar-user-contrib-text: #959494;
 
-/*
- *  Value Stream Analytics
- */
-$cycle-analytics-box-padding: 30px;
-$cycle-analytics-box-text-color: #8c8c8c;
-$cycle-analytics-big-font: 19px;
-$cycle-analytics-dismiss-icon-color: #b2b2b2;
-
 /*
 * CI
 */
diff --git a/app/assets/stylesheets/page_bundles/milestone.scss b/app/assets/stylesheets/page_bundles/milestone.scss
index c401f1a4902..5ca1e6b9967 100644
--- a/app/assets/stylesheets/page_bundles/milestone.scss
+++ b/app/assets/stylesheets/page_bundles/milestone.scss
@@ -1,4 +1,4 @@
-@import 'mixins_and_variables_and_functions';
+@import 'page_bundles/mixins_and_variables_and_functions';
 
 $status-box-line-height: 26px;
 
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index a9786116c68..4b52500423d 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -199,12 +199,15 @@
     .sidebar-contained-width,
     .issuable-sidebar-header {
       width: 100%;
-      border-bottom: 0;
     }
 
     .block {
       @include media-breakpoint-up(lg) {
-        padding: $gl-spacing-scale-5 0;
+        padding: $gl-spacing-scale-4 0 $gl-spacing-scale-5;
+      }
+
+      &.participants {
+        border-bottom: 0;
       }
     }
   }
@@ -213,7 +216,8 @@
   .sidebar-contained-width,
   .issuable-sidebar-header {
     @include clearfix;
-    padding: $gl-padding 0;
+    padding: $gl-spacing-scale-4 0 $gl-spacing-scale-5;
+    border-bottom: 1px solid $border-gray-normal;
     // This prevents the mess when resizing the sidebar
     // of elements repositioning themselves..
     width: $gutter-inner-width;
@@ -235,6 +239,13 @@
         }
       }
     }
+
+    &.time-tracking,
+    &.participants,
+    &.subscriptions,
+    &.with-sub-blocks {
+      padding-top: $gl-spacing-scale-5;
+    }
   }
 
   .block-first {
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 4e58f877217..cc2711e7009 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -112,6 +112,7 @@ module Ci
     end
 
     scope :unstarted, -> { where(runner_id: nil) }
+
     scope :with_downloadable_artifacts, -> do
       where('EXISTS (?)',
         Ci::JobArtifact.select(1)
@@ -120,6 +121,14 @@ module Ci
       )
     end
 
+    scope :with_erasable_artifacts, -> do
+      where('EXISTS (?)',
+        Ci::JobArtifact.select(1)
+          .where('ci_builds.id = ci_job_artifacts.job_id')
+        .where(file_type: Ci::JobArtifact.erasable_file_types)
+      )
+    end
+
     scope :in_pipelines, ->(pipelines) do
       where(pipeline: pipelines)
     end
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 1654a6d9a2d..fe2db8ed4ec 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -1182,6 +1182,10 @@ module Ci
       complete? && builds.latest.with_exposed_artifacts.exists?
     end
 
+    def has_erasable_artifacts?
+      complete? && builds.latest.with_erasable_artifacts.exists?
+    end
+
     def branch_updated?
       strong_memoize(:branch_updated) do
         push_details.branch_updated?
diff --git a/app/views/projects/pipeline_schedules/index.html.haml b/app/views/projects/pipeline_schedules/index.html.haml
index 661cf465081..a0412650b3a 100644
--- a/app/views/projects/pipeline_schedules/index.html.haml
+++ b/app/views/projects/pipeline_schedules/index.html.haml
@@ -16,7 +16,8 @@
   %ul.content-list
     = render partial: "table"
 - else
-  .card.bg-light.gl-mt-3
-    .nothing-here-block= _("No schedules")
+  = render Pajamas::CardComponent.new(card_options: { class: 'bg-light gl-mt-3 gl-text-center' }) do |c|
+    - c.body do
+      = _("No schedules")
 
 #pipeline-take-ownership-modal
diff --git a/app/workers/ci/pipeline_success_unlock_artifacts_worker.rb b/app/workers/ci/pipeline_success_unlock_artifacts_worker.rb
index 590514424bb..2a1f492cacb 100644
--- a/app/workers/ci/pipeline_success_unlock_artifacts_worker.rb
+++ b/app/workers/ci/pipeline_success_unlock_artifacts_worker.rb
@@ -13,7 +13,9 @@ module Ci
 
     def perform(pipeline_id)
       ::Ci::Pipeline.find_by_id(pipeline_id).try do |pipeline|
-        break unless pipeline.has_archive_artifacts?
+        # TODO: Move this check inside the Ci::UnlockArtifactsService
+        # once the feature flags in it have been removed.
+        break unless pipeline.has_erasable_artifacts?
 
         results = ::Ci::UnlockArtifactsService
           .new(pipeline.project, pipeline.user)
diff --git a/package.json b/package.json
index 5037aa8a866..b08616d586c 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
   "devDependencies": {
     "@gitlab/eslint-plugin": "17.0.0",
     "@gitlab/stylelint-config": "4.1.0",
-    "@graphql-eslint/eslint-plugin": "3.11.1",
+    "@graphql-eslint/eslint-plugin": "3.11.2",
     "@testing-library/dom": "^7.16.2",
     "@types/jest": "^27.5.1",
     "@vue/test-utils": "1.3.0",
diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_project_migration_common.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_project_migration_common.rb
index 3581ad3d207..9c80c088917 100644
--- a/qa/qa/specs/features/api/1_manage/migration/gitlab_project_migration_common.rb
+++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_project_migration_common.rb
@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 module QA
-  # Disable on live envs until bulk_import_projects toggle is on by default
-  # Otherwise tests running in parallel can disable feature in the middle of other test
   RSpec.shared_context 'with gitlab project migration', requires_admin: 'creates a user via API',
+                                                        quarantine: {
+                                                          type: :flaky,
+                                                          issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/364839'
+                                                        },
                                                         feature_flag: {
                                                           name: 'bulk_import_projects',
                                                           scope: :global
diff --git a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js
index f8ce947d778..f5a489f1a32 100644
--- a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js
@@ -311,7 +311,7 @@ describe('ReadyToMerge', () => {
         "the MR hasn't merged yet, and the backend-provided value expects to leave the branch",
         "the MR hasn't merged yet, and the backend-provided value is a non-boolean falsey value",
         "the MR hasn't merged yet, and the backend-provided value is a non-boolean truthy value",
-        'the MR has merged, and the backend reports that the branch has been removed',
+        'the MR has been merged, and the backend reports that the branch has been removed',
         'the MR has been merged, and the backend reports that the branch has not been removed',
         'the MR has been merged, and the backend reports a non-boolean falsey value',
         'the MR has been merged, and the backend reports a non-boolean truthy value',
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 675215d533c..41b817f231b 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -160,6 +160,42 @@ RSpec.describe Ci::Build do
     end
   end
 
+  describe '.with_erasable_artifacts' do
+    subject { described_class.with_erasable_artifacts }
+
+    context 'when job does not have any artifacts' do
+      let!(:job) { create(:ci_build) }
+
+      it 'does not return the job' do
+        is_expected.not_to include(job)
+      end
+    end
+
+    ::Ci::JobArtifact.erasable_file_types.each do |type|
+      context "when job has a #{type} artifact" do
+        it 'returns the job' do
+          job = create(:ci_build)
+          create(
+            :ci_job_artifact,
+            file_format: ::Ci::JobArtifact::TYPE_AND_FORMAT_PAIRS[type.to_sym],
+            file_type: type,
+            job: job
+          )
+
+          is_expected.to include(job)
+        end
+      end
+    end
+
+    context 'when job has a non-erasable artifact' do
+      let!(:job) { create(:ci_build, :trace_artifact) }
+
+      it 'does not return the job' do
+        is_expected.not_to include(job)
+      end
+    end
+  end
+
   describe '.with_live_trace' do
     subject { described_class.with_live_trace }
 
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 79f2565e173..839e5ed03cc 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -5546,4 +5546,43 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep do
       end
     end
   end
+
+  describe '#has_erasable_artifacts?' do
+    subject { pipeline.has_erasable_artifacts? }
+
+    context 'when pipeline is not complete' do
+      let(:pipeline) { create(:ci_pipeline, :running, :with_job) }
+
+      context 'and has erasable artifacts' do
+        before do
+          create(:ci_job_artifact, :archive, job: pipeline.builds.first)
+        end
+
+        it { is_expected.to be_falsey }
+      end
+    end
+
+    context 'when pipeline is complete' do
+      let(:pipeline) { create(:ci_pipeline, :success, :with_job) }
+
+      context 'and has no artifacts' do
+        it { is_expected.to be_falsey }
+      end
+
+      Ci::JobArtifact.erasable_file_types.each do |type|
+        context "and has an artifact of type #{type}" do
+          before do
+            create(
+              :ci_job_artifact,
+              file_format: ::Ci::JobArtifact::TYPE_AND_FORMAT_PAIRS[type.to_sym],
+              file_type: type,
+              job: pipeline.builds.first
+            )
+          end
+
+          it { is_expected.to be_truthy }
+        end
+      end
+    end
+  end
 end
diff --git a/spec/support/shared_examples/features/sidebar/sidebar_due_date_shared_examples.rb b/spec/support/shared_examples/features/sidebar/sidebar_due_date_shared_examples.rb
index 95c0a76d726..206116d66c8 100644
--- a/spec/support/shared_examples/features/sidebar/sidebar_due_date_shared_examples.rb
+++ b/spec/support/shared_examples/features/sidebar/sidebar_due_date_shared_examples.rb
@@ -20,6 +20,8 @@ RSpec.shared_examples 'date sidebar widget' do
         scroll_to(button)
         button.click
 
+        execute_script('document.querySelector(".issuable-sidebar")?.scrollBy(0, 50)')
+
         click_button today.to_s
 
         wait_for_requests
diff --git a/spec/workers/ci/pipeline_success_unlock_artifacts_worker_spec.rb b/spec/workers/ci/pipeline_success_unlock_artifacts_worker_spec.rb
index cb2cf58d50b..3b33972c76f 100644
--- a/spec/workers/ci/pipeline_success_unlock_artifacts_worker_spec.rb
+++ b/spec/workers/ci/pipeline_success_unlock_artifacts_worker_spec.rb
@@ -27,15 +27,18 @@ RSpec.describe Ci::PipelineSuccessUnlockArtifactsWorker do
     end
 
     context 'when pipeline exists' do
-      let(:pipeline) { create(:ci_pipeline, :success, :with_job) }
+      let!(:pipeline) { create(:ci_pipeline, :success, :with_job) }
       let(:pipeline_id) { pipeline.id }
 
-      context 'when pipeline has artifacts' do
-        before do
-          create(:ci_job_artifact, job: pipeline.builds.first)
-        end
+      before do
+        allow(Ci::Pipeline).to receive(:find_by_id).with(pipeline.id).and_return(pipeline)
+        allow(pipeline).to receive(:has_erasable_artifacts?).and_return(has_erasable_artifacts)
+      end
 
-        it 'calls the service' do
+      context 'when pipeline has erasable artifacts' do
+        let(:has_erasable_artifacts) { true }
+
+        it 'calls the unlock service' do
           service = spy(Ci::UnlockArtifactsService)
           expect(Ci::UnlockArtifactsService).to receive(:new).and_return(service)
 
@@ -45,8 +48,10 @@ RSpec.describe Ci::PipelineSuccessUnlockArtifactsWorker do
         end
       end
 
-      context 'when pipeline does not have artifacts' do
-        it 'does not call service' do
+      context 'when pipeline has no erasable artifacts' do
+        let(:has_erasable_artifacts) { false }
+
+        it 'does not call the unlock service' do
           expect(Ci::UnlockArtifactsService).not_to receive(:new)
 
           perform
diff --git a/tooling/config/CODEOWNERS.yml b/tooling/config/CODEOWNERS.yml
index 6b24134ea17..0fb336f3857 100644
--- a/tooling/config/CODEOWNERS.yml
+++ b/tooling/config/CODEOWNERS.yml
@@ -75,7 +75,6 @@
         - '**/merge_requests/**'
         - '/config/feature_flags/**/*'
         - '/ee/app/services/audit_events/**/*'
-        - '/ee/config/feature_flags/development/auditor_group_runner_access.yml'
         - '/ee/spec/services/audit_events/**/*'
         - '/ee/spec/services/ci/*'
         - '/ee/spec/services/personal_access_tokens/*'
diff --git a/yarn.lock b/yarn.lock
index f97faf02e7b..187e18182c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1090,10 +1090,10 @@
   dependencies:
     mustache "^4.2.0"
 
-"@graphql-eslint/eslint-plugin@3.11.1":
-  version "3.11.1"
-  resolved "https://registry.yarnpkg.com/@graphql-eslint/eslint-plugin/-/eslint-plugin-3.11.1.tgz#3ff3fce52d31d169fdbe33f70cb5234966d2bea1"
-  integrity sha512-y72HwLgCBMS5diGhtOM9EnDRY7rcyevbiHeLJPy0gjcVzAhj0xdH7dJV7aNLlVNSSqZ+3M8ZuKfwEX5ByFqx4w==
+"@graphql-eslint/eslint-plugin@3.11.2":
+  version "3.11.2"
+  resolved "https://registry.yarnpkg.com/@graphql-eslint/eslint-plugin/-/eslint-plugin-3.11.2.tgz#d982a45291aadd483c79c2bcb209166115ef6123"
+  integrity sha512-gnR6L2S64mesNyF34n/c3qOTIwu6MtapRhPQLHqU1/Qdf/7Ga9KKtFJKKxRrK7YbzlteMYweC05khhZycxDtLw==
   dependencies:
     "@babel/code-frame" "^7.16.7"
     "@graphql-tools/code-file-loader" "^7.2.14"