Update to 18.1.2

Author: j-bauer

scripts/18.1.2-ee.0/patch.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -ex
+
+for patch in /scripts/patches/*.patch; do
+	echo "Applying $patch ..."
+	patch -p0 < "$patch"
+done
+
+
+for script in /scripts/patches/*.sh; do
+	echo "Running $script ..."
+	"$script"
+done

scripts/18.1.2-ee.0/patches/_head.html.haml.patch

@@ -0,0 +1,9 @@
+--- /opt/gitlab/embedded/service/gitlab-rails/app/views/explore/projects/_head.html.haml	2024-01-17 13:51:44.978361699 +0000
++++ /opt/gitlab/embedded/service/gitlab-rails/app/views/explore/projects/_head.html.haml	2024-01-17 13:51:14.477881902 +0000
+@@ -1,5 +1,5 @@
+ - breadcrumb_title _("Projects")
+-- page_title _("Explore projects")
++- page_title _("Explore ARCs")
+ 
+ = render_dashboard_ultimate_trial(current_user)
+ = render_product_usage_data_collection_changes(current_user)

scripts/18.1.2-ee.0/patches/add-arc-js.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+set -- /opt/gitlab/embedded/service/gitlab-rails/public/assets/webpack/pages.projects.imports.new.*.chunk.js
+
+# exit if above's glob matches nothing or more than 1 file
+[ -e "$1" ] && [ "$#" = "1" ]
+
+# the mighty "patch"
+sed -Ei.bak \
+	's/sample:(\{text:Object\([^)]+\))/arc:\1("ProjectTemplates|ARC"),icon:".template-option .icon-gitlab_logo"},&/' \
+	"$1"
+
+# needs to be gzip'ed too
+gzip -kf "$1"
+
+# print diffs to see what was done
+diff -u "$1" "${1}.bak" || true

scripts/18.1.2-ee.0/patches/carrierwave_s3_encryption_headers_patch.rb.patch

@@ -0,0 +1,11 @@
+--- /opt/gitlab/embedded/service/gitlab-rails/config/initializers/carrierwave_s3_encryption_headers_patch.rb	2024-07-10 10:16:24.201574831 +0000
++++ /opt/gitlab/embedded/service/gitlab-rails/config/initializers/carrierwave_s3_encryption_headers_patch.rb	2024-07-10 10:16:57.405284779 +0000
+@@ -25,7 +25,7 @@
+           if ::Feature.enabled?(:s3_multithreaded_uploads, type: :ops) && fog_provider == 'AWS'
+             # AWS SDK uses 10 threads by default and a multipart chunk size of 10 MB
+             file.concurrency = 10
+-            file.multipart_chunk_size = 10485760
++            file.multipart_chunk_size = 10485760 / 10 * 1024 # 1 GiB
+             file.copy(@uploader.fog_directory, new_path, copy_to_options)
+           else
+             # Some Fog providers may issue a GET request (https://github.com/fog/fog-google/issues/512)

scripts/18.1.2-ee.0/patches/direct_upload.rb.patch

@@ -0,0 +1,19 @@
+--- /opt/gitlab/embedded/service/gitlab-rails/lib/object_storage/direct_upload.rb	2024-07-10 10:14:00.134830913 +0000
++++ /opt/gitlab/embedded/service/gitlab-rails/lib/object_storage/direct_upload.rb	2024-08-21 15:01:53.519335954 +0000
+@@ -16,7 +16,7 @@
+   class DirectUpload
+     include Gitlab::Utils::StrongMemoize
+ 
+-    TIMEOUT = 4.hours
++    TIMEOUT = 48.hours
+     EXPIRE_OFFSET = 15.minutes
+ 
+     MAXIMUM_MULTIPART_PARTS = 100
+@@ -133,6 +133,7 @@
+     end
+ 
+     def use_workhorse_s3_client?
++      return false
+       return false unless config.use_iam_profile? || config.consolidated_settings?
+       # The Golang AWS SDK does not support V2 signatures
+       return false unless credentials.fetch(:aws_signature_version, 4).to_i >= 4

scripts/18.1.2-ee.0/patches/lfs_token.rb.patch

@@ -0,0 +1,11 @@
+--- /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/lfs_token.rb	2023-04-04 15:32:49.679168014 +0200
++++ /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/lfs_token.rb	2023-04-04 12:52:34.978437027 +0200
+@@ -14,7 +14,7 @@
+ 
+     include LfsTokenHelper
+ 
+-    DEFAULT_EXPIRE_TIME = 7200 # Default value 2 hours
++    DEFAULT_EXPIRE_TIME = 86400 # Default value was 2 hours (=7200)
+ 
+     attr_accessor :actor
+ 

scripts/18.1.2-ee.0/patches/project_template.rb.patch

@@ -0,0 +1,10 @@
+--- /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/project_template.rb	2023-04-04 15:34:11.873379730 +0200
++++ /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/project_template.rb	2023-04-04 12:52:34.981770257 +0200
+@@ -53,6 +53,7 @@
+       # TODO: Review child inheritance of this table (see: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41699#note_430928221)
+       def localized_templates_table
+         [
++          ProjectTemplate.new('arc', 'ARC', _('Includes DataPLANT ARC structure'), 'https://gitlab.com/gitlab-org/project-templates/rails', '/assets/dataplant-arc.png'),
+           ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'),
+           ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'),
+           ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'),

scripts/latest

@@ -1 +1 @@
-18.1.1-ee.0
+18.1.2-ee.0