forked from nfdi4plants/DataHUB
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
dataplant
committed
May 13, 2024
1 parent
d0d33ce
commit 159b2f2
Showing
12 changed files
with
122 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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'), |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| latest |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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'), |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 16.10.2-ee.0/ | ||
| 16.11.1-ee.0/ |