diff --git a/README.md b/README.md index e6f01a1..23d55a4 100644 --- a/README.md +++ b/README.md @@ -17,8 +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.4.1~ynh1 - +**Shipped version:** 15.5.1~ynh1 **Demo:** https://gitlab.com/explore diff --git a/README_fr.md b/README_fr.md index 867cc8b..80bb542 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,8 +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.4.1~ynh1 - +**Version incluse :** 15.5.1~ynh1 **Démo :** https://gitlab.com/explore diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 3629f8a..004fc22 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -263,6 +263,18 @@ external_url '__GENERATED_EXTERNAL_URL__' ###! but continue accepting application requests. # gitlab_rails['shutdown_blackout_seconds'] = 10 +### Microsoft Graph Mailer +###! Allows delivery of emails using Microsoft Graph API with OAuth 2.0 client +###! credentials flow. +###! Docs: https://docs.gitlab.com/omnibus/settings/microsoft_graph_mailer.html +# gitlab_rails['microsoft_graph_mailer_enabled'] = false +# gitlab_rails['microsoft_graph_mailer_user_id'] = "YOUR-USER-ID" +# gitlab_rails['microsoft_graph_mailer_tenant'] = "YOUR-TENANT-ID" +# gitlab_rails['microsoft_graph_mailer_client_id'] = "YOUR-CLIENT-ID" +# gitlab_rails['microsoft_graph_mailer_client_secret'] = "YOUR-CLIENT-SECRET-ID" +# gitlab_rails['microsoft_graph_mailer_azure_ad_endpoint'] = "https://login.microsoftonline.com" +# gitlab_rails['microsoft_graph_mailer_graph_endpoint'] = "https://graph.microsoft.com" + ### Reply by email ###! Allow users to comment on issues and merge requests by replying to ###! notification emails. @@ -1476,6 +1488,7 @@ nginx['client_max_body_size'] = '__CLIENT_MAX_BODY_SIZE__' # nginx['ssl_session_timeout'] = "1d" # nginx['ssl_dhparam'] = nil # Path to dhparams.pem, eg. /etc/gitlab/ssl/dhparams.pem +# nginx['ssl_password_file'] = nil # Path to file with passphrases for ssl certificate secret keys # nginx['listen_addresses'] = ['*', '[::]'] ##! **Defaults to forcing web browsers to always communicate using only HTTPS** @@ -2458,7 +2471,6 @@ nginx['listen_https'] = false # praefect['key_path'] = "/var/opt/gitlab/prafect/key.pem" # praefect['prometheus_listen_addr'] = "localhost:9652" # praefect['prometheus_grpc_latency_buckets'] = "[0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0]" -# praefect['separate_database_metrics'] = true # praefect['logging_level'] = "warn" # praefect['logging_format'] = "json" # praefect['virtual_storages'] = { diff --git a/manifest.json b/manifest.json index df17c0d..d4318f7 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "15.4.1~ynh1", + "version": "15.5.1~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 d62c548..a8c12fb 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,17 +1,18 @@ #!/bin/bash -gitlab_version="15.4.1" +gitlab_version="15.5.1" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_bullseye_source_sha256="0136f97d3a8db2dfb85e7fffe1248a5aa1f61b2b142910225f98e9d570dd497b" -gitlab_x86_64_buster_source_sha256="0099e3876388ade063f88aa720b9208f389a168eb093c68ab07ffbc93b3fe910" +gitlab_x86_64_bullseye_source_sha256="cd5cb968d9b8b54ca2227615200d2d7a481e72765a9a0ad134ffb2391219d061" +gitlab_x86_64_buster_source_sha256="00a6feca1affc84a31f2e49e2dd60637647f84dfcedac7f4e8775d5f1c023c66" -gitlab_arm64_bullseye_source_sha256="5481b71f9b561362d468ad1e53afec7c77a8251404cd0053848f66a8e2e17656" -gitlab_arm64_buster_source_sha256="40d4c07d1c281a8d1dcf3794e715090514c7b627557245e879ec79c22d7efb27" +gitlab_arm64_bullseye_source_sha256="5454a26df52f7a85181b89a5a453a1699677f8307963236924f19119cd200ac0" +gitlab_arm64_buster_source_sha256="0697886fa8bebe60858f189d5eca22d89e33f6446b28f30f3d87ca4aef862c0e" -gitlab_arm_buster_source_sha256="e7febd850d745fa459bb9b02ebad74b7cba4541cb73e3ac7cedc55cbca2b40b2" +gitlab_arm_buster_source_sha256="c9ead418ba693c69345b615f4c1e98c8af3f8bffb30cbd5d807a531e235b9f7f" +gitlab_arm_bullseye_source_sha256="177c93e309e362018ce4a4ff572107dc86e916932c5ab2ff5f2271eb8aaf2995" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) @@ -32,12 +33,23 @@ elif [ "$architecture" = "arm64" ]; then gitlab_source_sha256=$gitlab_arm64_buster_source_sha256 fi elif [ "$architecture" = "arm" ]; 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.4.1" - gitlab_arm_buster_source_sha256="e7febd850d745fa459bb9b02ebad74b7cba4541cb73e3ac7cedc55cbca2b40b2" + if [ "$gitlab_debian_version" = "bullseye" ] + 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.1" + gitlab_arm_buster_source_sha256="c9ead418ba693c69345b615f4c1e98c8af3f8bffb30cbd5d807a531e235b9f7f" + 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.1" + gitlab_arm_bullseye_source_sha256="177c93e309e362018ce4a4ff572107dc86e916932c5ab2ff5f2271eb8aaf2995" + fi + gitlab_source_sha256=$gitlab_arm_bullseye_source_sha256 fi - gitlab_source_sha256=$gitlab_arm_buster_source_sha256 fi gitlab_filename="gitlab-ce-${gitlab_version}.deb"