Skip to content

Commit

Permalink
Upgrade to 16.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
TetraW committed Apr 2, 2024
1 parent 3f33a92 commit 50caf75
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 1 deletion.
11 changes: 11 additions & 0 deletions scripts/16.10.1-ee.0/patch.sh
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions scripts/16.10.1-ee.0/patches/_head.html.haml.patch
Original file line number Diff line number Diff line change
@@ -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)

19 changes: 19 additions & 0 deletions scripts/16.10.1-ee.0/patches/add-arc-js.sh
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions scripts/16.10.1-ee.0/patches/lfs_token.rb.patch
Original file line number Diff line number Diff line change
@@ -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

10 changes: 10 additions & 0 deletions scripts/16.10.1-ee.0/patches/project_template.rb.patch
Original file line number Diff line number Diff line change
@@ -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'),
2 changes: 1 addition & 1 deletion scripts/latest

0 comments on commit 50caf75

Please sign in to comment.