Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 14 deletions

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