Skip to content

Commit 159b2f2

Browse files
author
dataplant
committed
Add updagte to 16.11.1 and 16.11.2
1 parent d0d33ce commit 159b2f2

12 files changed

+122
-1
lines changed

‎scripts/16.11.1-ee.0/patch.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
3+
set -ex
4+
5+
for patch in /scripts/patches/*.patch; do
6+
patch -p0 < "$patch"
7+
done
8+
9+
for script in /scripts/patches/*.sh; do
10+
"$script"
11+
done

‎scripts/16.11.1-ee.0/patches/_head.html.haml.patch

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
--- /opt/gitlab/embedded/service/gitlab-rails/app/views/explore/projects/_head.html.haml 2024-01-17 13:51:44.978361699 +0000
2+
+++ /opt/gitlab/embedded/service/gitlab-rails/app/views/explore/projects/_head.html.haml 2024-01-17 13:51:14.477881902 +0000
3+
@@ -1,5 +1,5 @@
4+
- breadcrumb_title _("Projects")
5+
-- page_title _("Explore projects")
6+
+- page_title _("Explore ARCs")
7+
8+
= render_dashboard_ultimate_trial(current_user)
9+

‎scripts/16.11.1-ee.0/patches/add-arc-js.sh

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

‎scripts/16.11.1-ee.0/patches/lfs_token.rb.patch

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/lfs_token.rb 2023-04-04 15:32:49.679168014 +0200
2+
+++ /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/lfs_token.rb 2023-04-04 12:52:34.978437027 +0200
3+
@@ -14,7 +14,7 @@
4+
5+
include LfsTokenHelper
6+
7+
- DEFAULT_EXPIRE_TIME = 7200 # Default value 2 hours
8+
+ DEFAULT_EXPIRE_TIME = 86400 # Default value was 2 hours (=7200)
9+
10+
attr_accessor :actor
11+

‎scripts/16.11.1-ee.0/patches/project_template.rb.patch

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/project_template.rb 2023-04-04 15:34:11.873379730 +0200
2+
+++ /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/project_template.rb 2023-04-04 12:52:34.981770257 +0200
3+
@@ -53,6 +53,7 @@
4+
# rubocop:disable Metrics/AbcSize
5+
def localized_templates_table
6+
[
7+
+ ProjectTemplate.new('arc', 'ARC', _('Includes DataPLANT ARC structure'), 'https://gitlab.com/gitlab-org/project-templates/rails', '/assets/dataplant-arc.png'),
8+
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'),
9+
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'),
10+
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/16.11.2-ee.0/latest

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
latest

‎scripts/16.11.2-ee.0/patch.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
3+
set -ex
4+
5+
for patch in /scripts/patches/*.patch; do
6+
patch -p0 < "$patch"
7+
done
8+
9+
for script in /scripts/patches/*.sh; do
10+
"$script"
11+
done

‎scripts/16.11.2-ee.0/patches/_head.html.haml.patch

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
--- /opt/gitlab/embedded/service/gitlab-rails/app/views/explore/projects/_head.html.haml 2024-01-17 13:51:44.978361699 +0000
2+
+++ /opt/gitlab/embedded/service/gitlab-rails/app/views/explore/projects/_head.html.haml 2024-01-17 13:51:14.477881902 +0000
3+
@@ -1,5 +1,5 @@
4+
- breadcrumb_title _("Projects")
5+
-- page_title _("Explore projects")
6+
+- page_title _("Explore ARCs")
7+
8+
= render_dashboard_ultimate_trial(current_user)
9+

‎scripts/16.11.2-ee.0/patches/add-arc-js.sh

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

‎scripts/16.11.2-ee.0/patches/lfs_token.rb.patch

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/lfs_token.rb 2023-04-04 15:32:49.679168014 +0200
2+
+++ /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/lfs_token.rb 2023-04-04 12:52:34.978437027 +0200
3+
@@ -14,7 +14,7 @@
4+
5+
include LfsTokenHelper
6+
7+
- DEFAULT_EXPIRE_TIME = 7200 # Default value 2 hours
8+
+ DEFAULT_EXPIRE_TIME = 86400 # Default value was 2 hours (=7200)
9+
10+
attr_accessor :actor
11+

‎scripts/16.11.2-ee.0/patches/project_template.rb.patch

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/project_template.rb 2023-04-04 15:34:11.873379730 +0200
2+
+++ /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/project_template.rb 2023-04-04 12:52:34.981770257 +0200
3+
@@ -53,6 +53,7 @@
4+
# rubocop:disable Metrics/AbcSize
5+
def localized_templates_table
6+
[
7+
+ ProjectTemplate.new('arc', 'ARC', _('Includes DataPLANT ARC structure'), 'https://gitlab.com/gitlab-org/project-templates/rails', '/assets/dataplant-arc.png'),
8+
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'),
9+
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'),
10+
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
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.10.2-ee.0/
1+
16.11.1-ee.0/

0 commit comments

Comments
 (0)