diff --git a/README.md b/README.md index 716dc0f..ad37603 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # GitLab for YunoHost -[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) ![Working status](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) ![Working status](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) [![Install GitLab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlab) *[Lire ce readme en français.](./README_fr.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.7.3~ynh1 +**Shipped version:** 15.8.0~ynh1 **Demo:** https://gitlab.com/explore diff --git a/README_fr.md b/README_fr.md index e7bb6a4..e02092e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,25 +5,25 @@ It shall NOT be edited by hand. # GitLab pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) [![Installer GitLab avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlab) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer GitLab rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer GitLab rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD -**Version incluse :** 15.7.3~ynh1 +**Version incluse :** 15.8.0~ynh1 **Démo :** https://gitlab.com/explore -## Captures d'écran +## Captures d’écran -![Capture d'écran de GitLab](./doc/screenshots/GitLab_running_11.0_(2018-07).png) +![Capture d’écran de GitLab](./doc/screenshots/GitLab_running_11.0_(2018-07).png) ## Avertissements / informations importantes @@ -45,9 +45,9 @@ Comment configurer GitLab : ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -63,4 +63,4 @@ ou sudo yunohost app upgrade gitlab -u https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file diff --git a/conf/gitlab.rb b/conf/gitlab.rb index fec430b..a24d80c 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -747,7 +747,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['store_initial_root_password'] = true #### Set path to an initial license to be used while bootstrapping GitLab. -####! **Only applicable on initial setup, future license updations need to be done via UI. +####! **Only applicable on initial setup, future license updates need to be done via UI. ####! Updating the file specified in this path won't yield any change after the first reconfigure run. # gitlab_rails['initial_license_file'] = '/etc/gitlab/company.gitlab-license' @@ -1016,7 +1016,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ ################################################################################ ## GitLab User Settings ##! Modify default git user. -##! Docs: https://docs.gitlab.com/omnibus/settings/configuration.html#changing-the-name-of-the-git-user-group +##! Docs: https://docs.gitlab.com/omnibus/settings/configuration.html#change-the-name-of-the-git-user-or-group ################################################################################ # user['username'] = "git" @@ -1209,7 +1209,7 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # postgresql['home'] = "/var/opt/gitlab/postgresql" # postgresql['user_path'] = "/opt/gitlab/embedded/bin:/opt/gitlab/bin:$PATH" # postgresql['sql_user'] = "gitlab" -# postgresql['max_connections'] = 200 +# postgresql['max_connections'] = 400 # postgresql['md5_auth_cidr_addresses'] = [] # postgresql['trust_auth_cidr_addresses'] = [] # postgresql['wal_buffers'] = "-1" @@ -1661,21 +1661,14 @@ nginx['listen_https'] = false ##! internal git ################################################################################ +##! The format of the Omnibus gitconfig is: +##! { "section" => ["subsection = value"] } +##! For example: +##! { "pack" => ["threads = 1"] } ##! For multiple options under one header use array of comma separated values, ##! eg.: ##! { "receive" => ["fsckObjects = true"], "alias" => ["st = status", "co = checkout"] } - -# omnibus_gitconfig['system'] = { -# "pack" => ["threads = 1"], -# "receive" => ["fsckObjects = true", "advertisePushOptions = true"], -# "repack" => ["writeBitmaps = true"], -# "transfer" => ["hideRefs=^refs/tmp/", "hideRefs=^refs/keep-around/", "hideRefs=^refs/remotes/"], -# "core" => [ -# 'alternateRefsCommand="exit 0 #"', -# "fsyncObjectFiles = true" -# ], -# "fetch" => ["writeCommitGraph = true"] -# } +# omnibus_gitconfig['system'] = {} ################################################################################ ## GitLab Pages @@ -1952,6 +1945,14 @@ nginx['listen_https'] = false # gitlab_kas['log_directory'] = '/var/log/gitlab/gitlab-kas' # gitlab_kas['env_directory'] = '/opt/gitlab/etc/gitlab-kas/env' +################################################################################ +## GitLab Suggested Reviewers (EE Only) +##! Docs: https://docs.gitlab.com/ee/user/project/merge_requests/reviews/#suggested-reviewers +################################################################################ + +##! Shared secret used for authentication between Suggested Reviewers and GitLab +# suggested_reviewers['api_secret_key'] = nil # Will be generated if not set. Base64 encoded and exactly 32 bytes long. + ################################################################################ ## GitLab Mattermost ##! Docs: https://docs.gitlab.com/omnibus/gitlab-mattermost @@ -3002,7 +3003,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ # patroni['postgresql']['wal_log_hints'] = 'on' # patroni['postgresql']['max_worker_processes'] = 8 # patroni['postgresql']['max_locks_per_transaction'] = 64 -# patroni['postgresql']['max_connections'] = 200 +# patroni['postgresql']['max_connections'] = 400 # patroni['postgresql']['checkpoint_timeout'] = 30 ## The following can hold different values on all nodes. diff --git a/manifest.json b/manifest.json index 36db571..28b2718 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "15.7.3~ynh1", + "version": "15.8.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 002e874..e523c80 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,18 +1,18 @@ #!/bin/bash -gitlab_version="15.7.3" +gitlab_version="15.8.0" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_bullseye_source_sha256="12e4e36764fa1ef172038a0307e677956950ef36acc46e4f7e01d5daeebc6e4b" -gitlab_x86_64_buster_source_sha256="89a7e6eff4375e898451966f16ab75e3cc5591568c76578e94c7f6ac099215b6" +gitlab_x86_64_bullseye_source_sha256="5b24a53961f12fa68feb466d0106309a4e12719b25be1b7469dc66aefdfb8428" +gitlab_x86_64_buster_source_sha256="e9263e31eea55ee5011f82ad7e7c7fa1cc567bf07b0c02c1f1e8422a12e0deed" -gitlab_arm64_bullseye_source_sha256="8c1c9f5a6475e036f5306d374bdc05f23a9140986949a118928c316dca356d32" -gitlab_arm64_buster_source_sha256="a1ad0659ddd2be0d5d4a173cd1dade8c3ffbb927361731c71657b7847c43f94c" +gitlab_arm64_bullseye_source_sha256="ec4b52c756c7e46e36711edd7e889ed86b5eb1e6b5742dcfe4ef12bff2d1a43b" +gitlab_arm64_buster_source_sha256="048662441e22f3da0f970a4d2021847fa9540bc6fc5824a4d0c67453f547077f" -gitlab_arm_buster_source_sha256="336ffaf66926430d9af12d0ef9d1c194fc2a2fcfbb89e8ab128a41a2e6bc14ac" -gitlab_arm_bullseye_source_sha256="90861ee57b1e695350faa424d7e12a9edfdf03f6532403a77aeb31ca3e30c89a" +gitlab_arm_buster_source_sha256="854efbd055a23afa0c947c962b030ded3165d0a4af7ad84a0627a549160e3add" +gitlab_arm_bullseye_source_sha256="395cba0a44b6168b6834dff4defebfbd4a1f73a6e7e74e2a719514f3c30641ed" 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.7.3" - gitlab_arm_buster_source_sha256="336ffaf66926430d9af12d0ef9d1c194fc2a2fcfbb89e8ab128a41a2e6bc14ac" + gitlab_version="15.8.0" + gitlab_arm_buster_source_sha256="854efbd055a23afa0c947c962b030ded3165d0a4af7ad84a0627a549160e3add" 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.7.3" - gitlab_arm_bullseye_source_sha256="90861ee57b1e695350faa424d7e12a9edfdf03f6532403a77aeb31ca3e30c89a" + gitlab_version="15.8.0" + gitlab_arm_bullseye_source_sha256="395cba0a44b6168b6834dff4defebfbd4a1f73a6e7e74e2a719514f3c30641ed" fi gitlab_source_sha256=$gitlab_arm_bullseye_source_sha256 fi