From 50caf75edc49d0494c1c0f210006f100f88ca7d6 Mon Sep 17 00:00:00 2001
From: Debian <weidhase.jw@gmail.com>
Date: Tue, 2 Apr 2024 10:11:29 +0000
Subject: [PATCH] Upgrade to 16.10.1

---
 scripts/16.10.1-ee.0/patch.sh                 | 11 +++++++++++
 .../patches/_head.html.haml.patch             |  9 +++++++++
 scripts/16.10.1-ee.0/patches/add-arc-js.sh    | 19 +++++++++++++++++++
 .../16.10.1-ee.0/patches/lfs_token.rb.patch   | 11 +++++++++++
 .../patches/project_template.rb.patch         | 10 ++++++++++
 scripts/latest                                |  2 +-
 6 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100755 scripts/16.10.1-ee.0/patch.sh
 create mode 100644 scripts/16.10.1-ee.0/patches/_head.html.haml.patch
 create mode 100755 scripts/16.10.1-ee.0/patches/add-arc-js.sh
 create mode 100644 scripts/16.10.1-ee.0/patches/lfs_token.rb.patch
 create mode 100644 scripts/16.10.1-ee.0/patches/project_template.rb.patch

diff --git a/scripts/16.10.1-ee.0/patch.sh b/scripts/16.10.1-ee.0/patch.sh
new file mode 100755
index 0000000..2c21ea3
--- /dev/null
+++ b/scripts/16.10.1-ee.0/patch.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -ex
+
+for patch in /scripts/patches/*.patch; do
+	patch -p0 < "$patch"
+done
+
+for script in /scripts/patches/*.sh; do
+	"$script"
+done
diff --git a/scripts/16.10.1-ee.0/patches/_head.html.haml.patch b/scripts/16.10.1-ee.0/patches/_head.html.haml.patch
new file mode 100644
index 0000000..1120248
--- /dev/null
+++ b/scripts/16.10.1-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)
+ 
diff --git a/scripts/16.10.1-ee.0/patches/add-arc-js.sh b/scripts/16.10.1-ee.0/patches/add-arc-js.sh
new file mode 100755
index 0000000..f9c6bd7
--- /dev/null
+++ b/scripts/16.10.1-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
diff --git a/scripts/16.10.1-ee.0/patches/lfs_token.rb.patch b/scripts/16.10.1-ee.0/patches/lfs_token.rb.patch
new file mode 100644
index 0000000..8836591
--- /dev/null
+++ b/scripts/16.10.1-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
+ 
diff --git a/scripts/16.10.1-ee.0/patches/project_template.rb.patch b/scripts/16.10.1-ee.0/patches/project_template.rb.patch
new file mode 100644
index 0000000..6cc1ed5
--- /dev/null
+++ b/scripts/16.10.1-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 @@
+       # rubocop:disable Metrics/AbcSize
+       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'),
diff --git a/scripts/latest b/scripts/latest
index be507b2..cab6043 120000
--- a/scripts/latest
+++ b/scripts/latest
@@ -1 +1 @@
-16.9.2-ee.0/
\ No newline at end of file
+16.10.1-ee.0/
\ No newline at end of file