From fde9b7a7843386ee340119103c86c6e4fc48bc6e Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 6 Dec 2021 06:10:20 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .gitlab/ci/rules.gitlab-ci.yml                |  6 ++++++
 .rubocop_todo/rspec/timecop_freeze.yml        | 21 +++++++++++++++++++
 .../components/devops_score.vue               |  8 +++----
 app/services/groups/transfer_service.rb       |  6 +-----
 app/services/projects/transfer_service.rb     |  6 +-----
 .../ci_pending_builds_async_update.yml        |  8 -------
 doc/ci/yaml/index.md                          |  2 +-
 .../page/group/settings/usage_quotas.rb       |  2 ++
 .../components/devops_score_spec.js           |  8 +++----
 spec/services/groups/transfer_service_spec.rb | 14 -------------
 .../projects/transfer_service_spec.rb         | 14 -------------
 11 files changed, 40 insertions(+), 55 deletions(-)
 delete mode 100644 config/feature_flags/development/ci_pending_builds_async_update.yml

diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 6be48dc79fd..19fb8ced4ab 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -271,6 +271,7 @@
   - "danger/**/*"
   - "{,ee/,jh/}fixtures/**/*"
   - "{,ee/,jh/}rubocop/**/*"
+  - ".rubocop_todo/**/*.yml"
   - "{,ee/,jh/}spec/**/*"
   - "{,spec/}tooling/**/*"
 
@@ -289,6 +290,7 @@
   - "vendor/assets/**/*"
   - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
   - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,rubocop_manual_todo}.yml"
+  - ".rubocop_todo/**/*.yml"
   - "*_VERSION"
   - "{,jh/}Gemfile{,.lock}"
   - "Rakefile"
@@ -312,6 +314,7 @@
   - "vendor/assets/**/*"
   - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
   - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,rubocop_manual_todo}.yml"
+  - ".rubocop_todo/**/*.yml"
   - "*_VERSION"
   - "{,jh/}Gemfile{,.lock}"
   - "Rakefile"
@@ -342,6 +345,7 @@
   - "vendor/assets/**/*"
   - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
   - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,rubocop_manual_todo}.yml"
+  - ".rubocop_todo/**/*.yml"
   - "*_VERSION"
   - "{,jh/}Gemfile{,.lock}"
   - "Rakefile"
@@ -368,6 +372,7 @@
   - "vendor/assets/**/*"
   - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
   - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,rubocop_manual_todo}.yml"
+  - ".rubocop_todo/**/*.yml"
   - "*_VERSION"
   - "{,jh/}Gemfile{,.lock}"
   - "Rakefile"
@@ -401,6 +406,7 @@
   - "vendor/assets/**/*"
   - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
   - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,rubocop_manual_todo}.yml"
+  - ".rubocop_todo/**/*.yml"
   - "*_VERSION"
   - "{,jh/}Gemfile{,.lock}"
   - "Rakefile"
diff --git a/.rubocop_todo/rspec/timecop_freeze.yml b/.rubocop_todo/rspec/timecop_freeze.yml
index 38fe34c9488..c20c6214fa8 100644
--- a/.rubocop_todo/rspec/timecop_freeze.yml
+++ b/.rubocop_todo/rspec/timecop_freeze.yml
@@ -6,3 +6,24 @@ RSpec/TimecopFreeze:
   - ee/spec/lib/gitlab/geo/log_cursor/daemon_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/models/merge_train_spec.rb
+  - ee/spec/support/shared_contexts/lib/gitlab/insights/reducers/reducers_shared_contexts.rb
+  - qa/spec/support/repeater_spec.rb
+  - spec/features/users/active_sessions_spec.rb
+  - spec/lib/gitlab/analytics/cycle_analytics/base_query_builder_spec.rb
+  - spec/lib/gitlab/analytics/cycle_analytics/median_spec.rb
+  - spec/lib/gitlab/analytics/cycle_analytics/records_fetcher_spec.rb
+  - spec/lib/gitlab/auth/unique_ips_limiter_spec.rb
+  - spec/lib/gitlab/checks/timed_logger_spec.rb
+  - spec/lib/gitlab/cycle_analytics/stage_summary_spec.rb
+  - spec/lib/gitlab/puma_logging/json_formatter_spec.rb
+  - spec/lib/json_web_token/hmac_token_spec.rb
+  - spec/models/active_session_spec.rb
+  - spec/serializers/entity_date_helper_spec.rb
+  - spec/support/cycle_analytics_helpers/test_generation.rb
+  - spec/support/helpers/cycle_analytics_helpers.rb
+  - spec/support/helpers/javascript_fixtures_helpers.rb
+  - spec/support/shared_contexts/rack_attack_shared_context.rb
+  - spec/support/shared_examples/workers/concerns/reenqueuer_shared_examples.rb
+  - spec/workers/concerns/reenqueuer_spec.rb
+  - spec/workers/metrics/dashboard/prune_old_annotations_worker_spec.rb
diff --git a/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue b/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue
index 238081cc3c0..5a394059931 100644
--- a/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue
+++ b/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlBadge, GlTable, GlLink, GlEmptyState } from '@gitlab/ui';
+import { GlBadge, GlTableLite, GlLink, GlEmptyState } from '@gitlab/ui';
 import { GlSingleStat } from '@gitlab/ui/dist/charts';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import { sprintf, s__ } from '~/locale';
@@ -13,7 +13,7 @@ const defaultHeaderAttrs = {
 export default {
   components: {
     GlBadge,
-    GlTable,
+    GlTableLite,
     GlSingleStat,
     GlLink,
     GlEmptyState,
@@ -94,7 +94,7 @@ export default {
         :meta-text="devopsScoreMetrics.averageScore.scoreLevel.label"
         :variant="devopsScoreMetrics.averageScore.scoreLevel.variant"
       />
-      <gl-table
+      <gl-table-lite
         :fields="$options.tableHeaderFields"
         :items="devopsScoreMetrics.cards"
         thead-class="gl-border-t-0 gl-border-b-solid gl-border-b-1 gl-border-b-gray-100"
@@ -108,7 +108,7 @@ export default {
             }}</gl-badge>
           </div>
         </template>
-      </gl-table>
+      </gl-table-lite>
     </div>
   </div>
 </template>
diff --git a/app/services/groups/transfer_service.rb b/app/services/groups/transfer_service.rb
index f0582106df5..10ff4961faf 100644
--- a/app/services/groups/transfer_service.rb
+++ b/app/services/groups/transfer_service.rb
@@ -229,11 +229,7 @@ module Groups
     end
 
     def update_pending_builds
-      if Feature.enabled?(:ci_pending_builds_async_update, default_enabled: :yaml)
-        ::Ci::PendingBuilds::UpdateGroupWorker.perform_async(group.id, pending_builds_params)
-      else
-        ::Ci::UpdatePendingBuildService.new(group, pending_builds_params).execute
-      end
+      ::Ci::PendingBuilds::UpdateGroupWorker.perform_async(group.id, pending_builds_params)
     end
 
     def pending_builds_params
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 66b07d58bbd..17da77fe950 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -245,11 +245,7 @@ module Projects
     end
 
     def update_pending_builds
-      if Feature.enabled?(:ci_pending_builds_async_update, default_enabled: :yaml)
-        ::Ci::PendingBuilds::UpdateProjectWorker.perform_async(project.id, pending_builds_params)
-      else
-        ::Ci::UpdatePendingBuildService.new(project, pending_builds_params).execute
-      end
+      ::Ci::PendingBuilds::UpdateProjectWorker.perform_async(project.id, pending_builds_params)
     end
 
     def pending_builds_params
diff --git a/config/feature_flags/development/ci_pending_builds_async_update.yml b/config/feature_flags/development/ci_pending_builds_async_update.yml
deleted file mode 100644
index 3871d2a8bca..00000000000
--- a/config/feature_flags/development/ci_pending_builds_async_update.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_pending_builds_async_update
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75197
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346641
-milestone: '14.6'
-type: development
-group: group::pipeline execution
-default_enabled: false
diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md
index 704ae1b6ef4..b16ea44f6c0 100644
--- a/doc/ci/yaml/index.md
+++ b/doc/ci/yaml/index.md
@@ -921,7 +921,7 @@ rspec:
 
 - Combining reports in parent pipelines using [artifacts from child pipelines](#needspipelinejob) is
   not supported. Track progress on adding support in [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/215725).
-- To be able to browse the report output files, include the [`artifacts:paths`](#artifactspaths) keyword.
+- To be able to browse the report output files, include the [`artifacts:paths`](#artifactspaths) keyword. Please note that this will upload and store the artifact twice.
 - The test reports are collected regardless of the job results (success or failure).
   You can use [`artifacts:expire_in`](#artifactsexpire_in) to set up an expiration
   date for artifacts reports.
diff --git a/qa/lib/gitlab/page/group/settings/usage_quotas.rb b/qa/lib/gitlab/page/group/settings/usage_quotas.rb
index b935c52dd76..3b31d1c0a1c 100644
--- a/qa/lib/gitlab/page/group/settings/usage_quotas.rb
+++ b/qa/lib/gitlab/page/group/settings/usage_quotas.rb
@@ -10,7 +10,9 @@ module Gitlab
           link :buy_ci_minutes, text: 'Buy additional minutes'
           link :buy_storage, text: /Purchase more storage/
           strong :additional_minutes, text: 'Additional minutes'
+          strong :plan_minutes, text: 'Current period usage'
           div :purchased_usage, 'data-testid': 'purchased-usage'
+          div(:plan_minutes_usage) { plan_minutes_element.following_sibling.span }
           div(:additional_minutes_usage) { additional_minutes_element.following_sibling.span }
           div :ci_purchase_successful_alert, text: /You have successfully purchased CI minutes/
           div :storage_purchase_successful_alert, text: /You have successfully purchased a storage/
diff --git a/spec/frontend/admin/analytics/devops_score/components/devops_score_spec.js b/spec/frontend/admin/analytics/devops_score/components/devops_score_spec.js
index 824eb033671..3087792521c 100644
--- a/spec/frontend/admin/analytics/devops_score/components/devops_score_spec.js
+++ b/spec/frontend/admin/analytics/devops_score/components/devops_score_spec.js
@@ -1,4 +1,4 @@
-import { GlTable, GlBadge, GlEmptyState } from '@gitlab/ui';
+import { GlTableLite, GlBadge, GlEmptyState } from '@gitlab/ui';
 import { GlSingleStat } from '@gitlab/ui/dist/charts';
 import { mount } from '@vue/test-utils';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
@@ -20,7 +20,7 @@ describe('DevopsScore', () => {
     );
   };
 
-  const findTable = () => wrapper.findComponent(GlTable);
+  const findTable = () => wrapper.findComponent(GlTableLite);
   const findEmptyState = () => wrapper.findComponent(GlEmptyState);
   const findCol = (testId) => findTable().find(`[data-testid="${testId}"]`);
   const findUsageCol = () => findCol('usageCol');
@@ -124,11 +124,11 @@ describe('DevopsScore', () => {
 
         describe('table columns', () => {
           describe('Your usage', () => {
-            it('displays the corrrect value', () => {
+            it('displays the correct value', () => {
               expect(findUsageCol().text()).toContain('3.2');
             });
 
-            it('displays the corrrect badge', () => {
+            it('displays the correct badge', () => {
               const badge = findUsageCol().find(GlBadge);
 
               expect(badge.exists()).toBe(true);
diff --git a/spec/services/groups/transfer_service_spec.rb b/spec/services/groups/transfer_service_spec.rb
index 59ec78bf9ec..3a696228382 100644
--- a/spec/services/groups/transfer_service_spec.rb
+++ b/spec/services/groups/transfer_service_spec.rb
@@ -814,20 +814,6 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do
           expect(unrelated_pending_build.namespace_id).to eq(other_project.namespace_id)
           expect(unrelated_pending_build.namespace_traversal_ids).to eq(other_project.namespace.traversal_ids)
         end
-
-        context 'when ci_pending_builds_async_update is disabled' do
-          let(:update_pending_build_service) { instance_double(::Ci::PendingBuilds::UpdateGroupWorker) }
-
-          before do
-            stub_feature_flags(ci_pending_builds_async_update: false)
-          end
-
-          it 'does not call the new worker' do
-            expect(::Ci::PendingBuilds::UpdateGroupWorker).not_to receive(:perform_async)
-
-            transfer_service.execute(new_parent_group)
-          end
-        end
       end
     end
 
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb
index 93b7ce56247..ddd16100b40 100644
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
@@ -189,20 +189,6 @@ RSpec.describe Projects::TransferService do
         expect(unrelated_pending_build.namespace_id).to eq(other_project.namespace_id)
         expect(unrelated_pending_build.namespace_traversal_ids).to eq(other_project.namespace.traversal_ids)
       end
-
-      context 'when ci_pending_builds_async_update is disabled' do
-        let(:update_pending_build_service) { instance_double(::Ci::PendingBuilds::UpdateProjectWorker) }
-
-        before do
-          stub_feature_flags(ci_pending_builds_async_update: false)
-        end
-
-        it 'does not call the new worker' do
-          expect(::Ci::PendingBuilds::UpdateProjectWorker).not_to receive(:perform_async)
-
-          execute_transfer
-        end
-      end
     end
   end