Add latest changes from gitlab-org/gitlab@master

4 files changed, 15 insertions, 8 deletions

diff --git a/app/services/ci/job_artifacts/create_service.rb b/app/services/ci/job_artifacts/create_service.rb
index 1de2424924a..f7e04c59463 100644
--- a/app/services/ci/job_artifacts/create_service.rb
+++ b/app/services/ci/job_artifacts/create_service.rb
@@ -23,7 +23,11 @@ module Ci
         result = validate_requirements(artifact_type: artifact_type, filesize: filesize)
         return result unless result[:status] == :success
 
-        headers = JobArtifactUploader.workhorse_authorize(has_length: false, maximum_size: max_size(artifact_type))
+        headers = JobArtifactUploader.workhorse_authorize(
+          has_length: false,
+          maximum_size: max_size(artifact_type),
+          use_final_store_path: Feature.enabled?(:ci_artifacts_upload_to_final_location, project)
+        )
 
         if lsif?(artifact_type)
           headers[:ProcessLsif] = true
diff --git a/app/services/issues/build_service.rb b/app/services/issues/build_service.rb
index d8c7c5d4455..a65fc0c7c87 100644
--- a/app/services/issues/build_service.rb
+++ b/app/services/issues/build_service.rb
@@ -84,15 +84,17 @@ module Issues
                        end
 
       base_type = work_item_type&.base_type
+
       if create_issue_type_allowed?(container, base_type)
         issue.work_item_type = work_item_type
         # Up to this point issue_type might be set to the default, so we need to sync if a work item type is provided
-        issue.issue_type = work_item_type.base_type
+        issue.issue_type = base_type
+      else
+        # If no work item type was provided or not allowed, we need to set it to issue_type,
+        # and that includes the column default
+        issue_type = issue_params[:issue_type] || ::Issue::DEFAULT_ISSUE_TYPE
+        issue.work_item_type = WorkItems::Type.default_by_type(issue_type)
       end
-
-      # If no work item type was provided, we need to set it to whatever issue_type was up to this point,
-      # and that includes the column default
-      issue.work_item_type = WorkItems::Type.default_by_type(issue.issue_type)
     end
 
     def model_klass
diff --git a/app/services/issues/export_csv_service.rb b/app/services/issues/export_csv_service.rb
index d7c1ea276de..9e524d90505 100644
--- a/app/services/issues/export_csv_service.rb
+++ b/app/services/issues/export_csv_service.rb
@@ -18,7 +18,7 @@ module Issues
     private
 
     def associations_to_preload
-      [:author, :assignees, :timelogs, :milestone, { project: { namespace: :route } }]
+      [:work_item_type, :author, :assignees, :timelogs, :milestone, { project: { namespace: :route } }]
     end
 
     def header_to_value_hash
diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb
index 2cf3f36eef1..201bf19b535 100644
--- a/app/services/issues/update_service.rb
+++ b/app/services/issues/update_service.rb
@@ -39,7 +39,8 @@ module Issues
     def change_work_item_type(issue)
       return unless issue.changed_attributes['issue_type']
 
-      type_id = find_work_item_type_id(issue.issue_type)
+      issue_type = params[:issue_type] || ::Issue::DEFAULT_ISSUE_TYPE
+      type_id = find_work_item_type_id(issue_type)
 
       issue.work_item_type_id = type_id
     end