Add latest changes from gitlab-org/gitlab@master

5 files changed, 17 insertions, 17 deletions

diff --git a/app/assets/javascripts/import_entities/components/import_status.vue b/app/assets/javascripts/import_entities/components/import_status.vue
index db677c574d1..e2a4cca289d 100644
--- a/app/assets/javascripts/import_entities/components/import_status.vue
+++ b/app/assets/javascripts/import_entities/components/import_status.vue
@@ -142,7 +142,13 @@ export default {
 <template>
   <div>
     <div class="gl-display-inline-block gl-w-13">
-      <gl-badge :icon="mappedStatus.icon" :variant="mappedStatus.variant" size="md" class="gl-mr-2">
+      <gl-badge
+        :icon="mappedStatus.icon"
+        :variant="mappedStatus.variant"
+        size="md"
+        icon-size="sm"
+        class="gl-mr-2"
+      >
         {{ mappedStatus.text }}
       </gl-badge>
     </div>
diff --git a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue
index 4f3b482d7f8..167db3ce1f2 100644
--- a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue
+++ b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue
@@ -74,7 +74,7 @@ export default {
     <user-avatar-link
       v-for="item in visibleItems"
       :key="item.id"
-      :link-href="item.web_url"
+      :link-href="item.web_url || item.webUrl"
       :img-src="item.avatar_url || item.avatarUrl"
       :img-alt="item.name"
       :tooltip-text="item.name"
diff --git a/app/models/ci/build_need.rb b/app/models/ci/build_need.rb
index 3fa17d6d286..03d1bd14bfb 100644
--- a/app/models/ci/build_need.rb
+++ b/app/models/ci/build_need.rb
@@ -4,6 +4,9 @@ module Ci
   class BuildNeed < Ci::ApplicationRecord
     include Ci::Partitionable
     include BulkInsertSafe
+    include IgnorableColumns
+
+    ignore_column :id_convert_to_bigint, remove_with: '16.0', remove_after: '2023-04-22'
 
     belongs_to :build, class_name: "Ci::Processable", foreign_key: :build_id, inverse_of: :needs
 
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 19acd86a7f4..db58a995f0b 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -387,7 +387,10 @@ module Ci
     end
 
     def short_sha
-      token[0...8] if token
+      return unless token
+
+      start_index = created_via_ui? ? CREATED_RUNNER_TOKEN_PREFIX.length : 0
+      token[start_index..start_index + 8]
     end
 
     def tag_list
diff --git a/app/services/import/gitlab_projects/file_acquisition_strategies/remote_file.rb b/app/services/import/gitlab_projects/file_acquisition_strategies/remote_file.rb
index e179a14c497..e30818cc5d2 100644
--- a/app/services/import/gitlab_projects/file_acquisition_strategies/remote_file.rb
+++ b/app/services/import/gitlab_projects/file_acquisition_strategies/remote_file.rb
@@ -16,10 +16,8 @@ module Import
           allow_local_network: allow_local_requests?,
           dns_rebind_protection: true
         }
-        validate :aws_s3, if: :validate_aws_s3?
-        # When removing the import_project_from_remote_file_s3 remove the
-        # whole condition of this validation:
-        validates_with RemoteFileValidator, if: -> { validate_aws_s3? || !s3_request? }
+
+        validates_with RemoteFileValidator, if: -> { !s3_request? }
 
         def initialize(params:, current_user: nil)
           @params = params
@@ -47,20 +45,10 @@ module Import
 
         attr_reader :params
 
-        def aws_s3
-          if s3_request?
-            errors.add(:base, 'To import from AWS S3 use `projects/remote-import-s3`')
-          end
-        end
-
         def s3_request?
           headers['Server'] == 'AmazonS3' && headers['x-amz-request-id'].present?
         end
 
-        def validate_aws_s3?
-          ::Feature.enabled?(:import_project_from_remote_file_s3)
-        end
-
         def headers
           return {} if file_url.blank?