Add latest changes from gitlab-org/gitlab@master

4 files changed, 10 insertions, 24 deletions

diff --git a/app/assets/javascripts/registry/explorer/pages/details.vue b/app/assets/javascripts/registry/explorer/pages/details.vue
index 88e437b16d9..be9a27e2c42 100644
--- a/app/assets/javascripts/registry/explorer/pages/details.vue
+++ b/app/assets/javascripts/registry/explorer/pages/details.vue
@@ -327,6 +327,7 @@ export default {
     </gl-table>
 
     <gl-pagination
+      v-if="!isLoading"
       ref="pagination"
       v-model="currentPage"
       :per-page="tagsPagination.perPage"
diff --git a/app/controllers/import/gitlab_projects_controller.rb b/app/controllers/import/gitlab_projects_controller.rb
index 6b8436d766c..6a3715a4675 100644
--- a/app/controllers/import/gitlab_projects_controller.rb
+++ b/app/controllers/import/gitlab_projects_controller.rb
@@ -48,14 +48,7 @@ class Import::GitlabProjectsController < Import::BaseController
   private
 
   def file_is_valid?
-    # TODO: remove the condition and the private method after the WH version including
-    # https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/470
-    # is released and GITLAB_WORKHORSE_VERSION is updated accordingly.
-    if with_workhorse_upload_acceleration?
-      return false unless project_params[:file].is_a?(::UploadedFile)
-    else
-      return false unless project_params[:file] && project_params[:file].respond_to?(:read)
-    end
+    return false unless project_params[:file].is_a?(::UploadedFile)
 
     filename = project_params[:file].original_filename
 
@@ -75,8 +68,4 @@ class Import::GitlabProjectsController < Import::BaseController
   def whitelist_query_limiting
     Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42437')
   end
-
-  def with_workhorse_upload_acceleration?
-    request.headers[Gitlab::Workhorse::INTERNAL_API_REQUEST_HEADER].present?
-  end
 end
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 517f2312a76..b555b78cda6 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -598,19 +598,15 @@ module Ci
     end
 
     def merge_request
-      return @merge_request if defined?(@merge_request)
+      strong_memoize(:merge_request) do
+        merge_requests = MergeRequest.includes(:latest_merge_request_diff)
+          .where(source_branch: ref, source_project: pipeline.project)
+          .reorder(iid: :desc)
 
-      @merge_request ||=
-        begin
-          merge_requests = MergeRequest.includes(:latest_merge_request_diff)
-            .where(source_branch: ref,
-                   source_project: pipeline.project)
-            .reorder(iid: :desc)
-
-          merge_requests.find do |merge_request|
-            merge_request.commit_shas.include?(pipeline.sha)
-          end
+        merge_requests.find do |merge_request|
+          merge_request.commit_shas.include?(pipeline.sha)
         end
+      end
     end
 
     def repo_url
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 6b336f3eba2..8c272a73d40 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -16,7 +16,7 @@
 %head{ prefix: "og: http://ogp.me/ns#" }
   %meta{ charset: "utf-8" }
 
-  - if Feature.enabled?('asset_host_prefetch') && ActionController::Base.asset_host
+  - if ActionController::Base.asset_host
     %link{ rel: 'dns-prefetch', href: ActionController::Base.asset_host }
     %link{ rel: 'preconnnect', href: ActionController::Base.asset_host, crossorigin: '' }