From bed05965b2dfd81d24edc4889c7540f240ea72b4 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 23 Nov 2022 12:20:29 +0100 Subject: [PATCH 1/2] 15.6.0 --- conf/gitlab.rb | 1 + manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 004fc22..60cb84b 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -1755,6 +1755,7 @@ nginx['listen_https'] = false # gitlab_pages['internal_gitlab_server'] = nil # Defaults to gitlab_server, can be changed to internal load balancer # gitlab_pages['auth_secret'] = nil # Generated if not present # gitlab_pages['auth_scope'] = nil # Defaults to api, can be changed to read_api to increase security +# gitlab_pages['auth_cookie_session_timeout'] = "10m" # Authentication cookie session timeout (truncated to seconds). A zero value means the cookie will be deleted after the browser session ends ##! GitLab Pages Server Shutdown Timeout ##! Duration ("30s" for 30 seconds) diff --git a/manifest.json b/manifest.json index 81aac3d..2d97a49 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "15.5.2~ynh1", + "version": "15.6.0~ynh1", "description": { "en": "Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features", "fr": "Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 36b4e09..ea9a4dc 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,18 +1,18 @@ #!/bin/bash -gitlab_version="15.5.2" +gitlab_version="15.6.0" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_bullseye_source_sha256="22031a4bb2ae8e84591d0d148b7e48f78aca46d13dfa93c6dac3476b9444643e" -gitlab_x86_64_buster_source_sha256="1d36367e8e1424514ef09cefefcce65183e923d6ace9e9432cafd9bfa581eb54" +gitlab_x86_64_bullseye_source_sha256="432d197845a62d8997c582e1f4364ee5b11c60e2cf446533195737b095bcadc5" +gitlab_x86_64_buster_source_sha256="d5367b484aa427f1c3c5a5fe6b73be3c1f9784231d039fd273d506fcbe3bc943" -gitlab_arm64_bullseye_source_sha256="ca35a8750ae390a535de834a9e01ecff66ff4ed8534bce1053c54e1d0dc0f29d" -gitlab_arm64_buster_source_sha256="b791885b296d8476ce85246ea45aeeff51c891afa5d1138ccb338722eee8dcfa" +gitlab_arm64_bullseye_source_sha256="d4cceddf769b8a7ac075276cf13262bf475e90c43d518d48134a4872e5727195" +gitlab_arm64_buster_source_sha256="93eaa468047f5d53903a7de3fabc999a730914b8ce420cef5608736ca98acf7f" -gitlab_arm_buster_source_sha256="673edcaee9d861b7b6540cbdfad3a35861d2cc095b3b8e33e962c291c69f97bd" -gitlab_arm_bullseye_source_sha256="282d24a8405ea84e20985c136bffa8ed18975c5b81231c7e086ccc726a946ab4" +gitlab_arm_buster_source_sha256="762dd3669e4220494f654c57b984796c90b1b99c3f5f3c14e7bbbb2d429db461" +gitlab_arm_bullseye_source_sha256="184539ee24a1cb7f5c4e2f1ba3143e811473d1f2d2ed7501dedf23dc5d5029f7" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) @@ -37,16 +37,16 @@ elif [ "$architecture" = "arm" ]; then then # If the version for arm doesn't exist, then use an older one if [ -z "$gitlab_arm_buster_source_sha256" ]; then - gitlab_version="15.5.2" - gitlab_arm_buster_source_sha256="673edcaee9d861b7b6540cbdfad3a35861d2cc095b3b8e33e962c291c69f97bd" + gitlab_version="15.6.0" + gitlab_arm_buster_source_sha256="762dd3669e4220494f654c57b984796c90b1b99c3f5f3c14e7bbbb2d429db461" fi gitlab_source_sha256=$gitlab_arm_buster_source_sha256 elif [ "$gitlab_debian_version" = "buster" ] then # If the version for arm doesn't exist, then use an older one if [ -z "$gitlab_arm_bullseye_source_sha256" ]; then - gitlab_version="15.5.2" - gitlab_arm_bullseye_source_sha256="282d24a8405ea84e20985c136bffa8ed18975c5b81231c7e086ccc726a946ab4" + gitlab_version="15.6.0" + gitlab_arm_bullseye_source_sha256="184539ee24a1cb7f5c4e2f1ba3143e811473d1f2d2ed7501dedf23dc5d5029f7" fi gitlab_source_sha256=$gitlab_arm_bullseye_source_sha256 fi From b5905195cacc1fed721b826d4845ea9bcd8fc4d5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 23 Nov 2022 11:20:40 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3a4d9dc..585fa21 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features -**Shipped version:** 15.5.2~ynh1 +**Shipped version:** 15.6.0~ynh1 **Demo:** https://gitlab.com/explore diff --git a/README_fr.md b/README_fr.md index 182821f..d5ee0c7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD -**Version incluse :** 15.5.2~ynh1 +**Version incluse :** 15.6.0~ynh1 **Démo :** https://gitlab.com/explore