Merge pull request #207 from YunoHost-Apps/testing

Testing

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.6.0~ynh1
+**Shipped version:** 15.7.0~ynh1
 
 **Demo:** https://gitlab.com/explore
 

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.6.0~ynh1
+**Version incluse :** 15.7.0~ynh1
 
 **Démo :** https://gitlab.com/explore
 

conf/gitlab.rb

@@ -491,6 +491,9 @@ external_url '__GENERATED_EXTERNAL_URL__'
 ### Impersonation settings
 # gitlab_rails['impersonation_enabled'] = true
 
+### Disable jQuery and CSS animations
+# gitlab_rails['disable_animations'] = false
+
 ### Application settings cache expiry in seconds. (default: 60)
 # gitlab_rails['application_settings_cache_seconds'] = 60
 
@@ -598,7 +601,7 @@ EOS
 # gitlab_rails['omniauth_block_auto_created_users'] = true
 # gitlab_rails['omniauth_auto_link_ldap_user'] = false
 # gitlab_rails['omniauth_auto_link_saml_user'] = false
-# gitlab_rails['omniauth_auto_link_user'] = ['saml']
+# gitlab_rails['omniauth_auto_link_user'] = ['twitter']
 # gitlab_rails['omniauth_external_providers'] = ['twitter', 'google_oauth2']
 # gitlab_rails['omniauth_allow_bypass_two_factor'] = ['google_oauth2']
 # gitlab_rails['omniauth_providers'] = [
@@ -712,6 +715,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__
 # gitlab_rails['extra_matomo_url'] = '_your_matomo_url'
 # gitlab_rails['extra_matomo_site_id'] = '_your_matomo_site_id'
 # gitlab_rails['extra_matomo_disable_cookies'] = false
+# gitlab_rails['extra_maximum_text_highlight_size_kilobytes'] = 512
 
 ##! Docs: https://docs.gitlab.com/omnibus/settings/environment-variables.html
 # gitlab_rails['env'] = {
@@ -1097,7 +1101,7 @@ puma['port'] = __PUMA_PORT__
 # sidekiq['shutdown_timeout'] = 4
 # sidekiq['queue_selector'] = false
 # sidekiq['interval'] = nil
-# sidekiq['max_concurrency'] = 50
+# sidekiq['max_concurrency'] = 20
 # sidekiq['min_concurrency'] = nil
 
 ##! GitLab allows route a job to a particular queue determined by an array of ##! routing rules.
@@ -2425,6 +2429,17 @@ nginx['listen_https'] = false
 #   }
 # ]
 #
+## Gitaly knows to set up the required default configuration for spawned Git
+## commands automatically. It should thus not be required to configure anything
+## here, except in very special situations where you must e.g. tweak specific
+## performance-related settings or enable debugging facilities. It is not safe in
+## general to set Git configuration that may change Git output in ways that are
+## unexpected by Gitaly.
+# gitaly['gitconfig'] = [
+#   { 'section': 'pack', 'key': 'threads', 'value': '4' }
+#   { 'section': 'http', 'subsection': 'http://example.com', 'key': 'proxy', 'value': 'http://example.proxy.com' }
+# ]
+#
 # gitaly['daily_maintenance_start_hour'] = 22
 # gitaly['daily_maintenance_start_minute'] = 30
 # gitaly['daily_maintenance_duration'] = '30m'
@@ -2526,6 +2541,7 @@ nginx['listen_https'] = false
 # praefect['database_direct_sslcert'] = '/path/to/client-cert'
 # praefect['database_direct_sslkey'] = '/path/to/client-key'
 # praefect['database_direct_sslrootcert'] = '/path/to/rootcert'
+# praefect['graceful_stop_timeout'] = '1m'
 
 ##! Service name used to register Praefect as a Consul service
 # praefect['consul_service_name'] = 'praefect'

manifest.json

@@ -2,7 +2,7 @@
     "name": "GitLab",
     "id": "gitlab",
     "packaging_format": 1,
-    "version": "15.6.0~ynh1",
+    "version": "15.7.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"

scripts/upgrade.d/upgrade.last.sh

@@ -1,18 +1,18 @@
 #!/bin/bash
 
-gitlab_version="15.6.0"
+gitlab_version="15.7.0"
 
 # sha256sum found here: https://packages.gitlab.com/gitlab
 gitlab_debian_version="$(lsb_release -sc)"
 
-gitlab_x86_64_bullseye_source_sha256="432d197845a62d8997c582e1f4364ee5b11c60e2cf446533195737b095bcadc5"
-gitlab_x86_64_buster_source_sha256="d5367b484aa427f1c3c5a5fe6b73be3c1f9784231d039fd273d506fcbe3bc943"
+gitlab_x86_64_bullseye_source_sha256="4c346a5774313286a17b8fd082904ee49f5b0e809ad3f035d2892f12df239193"
+gitlab_x86_64_buster_source_sha256="e152f9a813b19fd77c08fc878caa7c83695c0d0f91b907594ca1a446e04c21ed"
 
-gitlab_arm64_bullseye_source_sha256="d4cceddf769b8a7ac075276cf13262bf475e90c43d518d48134a4872e5727195"
-gitlab_arm64_buster_source_sha256="93eaa468047f5d53903a7de3fabc999a730914b8ce420cef5608736ca98acf7f"
+gitlab_arm64_bullseye_source_sha256="093df2c6d5c555d4206e9d3da90f5109fb216c25cee1289296a89a53eaca7717"
+gitlab_arm64_buster_source_sha256="365285f23756d568f880aa82ae1ecf5da831fa84fb54ec3332be9c28ce1a76d7"
 
-gitlab_arm_buster_source_sha256="762dd3669e4220494f654c57b984796c90b1b99c3f5f3c14e7bbbb2d429db461"
-gitlab_arm_bullseye_source_sha256="184539ee24a1cb7f5c4e2f1ba3143e811473d1f2d2ed7501dedf23dc5d5029f7"
+gitlab_arm_buster_source_sha256="13a57dc9c98787912e93dfd61c40e7f916079373280057175fc5722e21cbc7be"
+gitlab_arm_bullseye_source_sha256="e47edd99dc25acc9a58e56e8878b06682f830e90a1d7c5d19cd6d186b9ad6a77"
 
 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.6.0"
-			gitlab_arm_buster_source_sha256="762dd3669e4220494f654c57b984796c90b1b99c3f5f3c14e7bbbb2d429db461"
+			gitlab_version="15.7.0"
+			gitlab_arm_buster_source_sha256="13a57dc9c98787912e93dfd61c40e7f916079373280057175fc5722e21cbc7be"
 		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.6.0"
-			gitlab_arm_bullseye_source_sha256="184539ee24a1cb7f5c4e2f1ba3143e811473d1f2d2ed7501dedf23dc5d5029f7"
+			gitlab_version="15.7.0"
+			gitlab_arm_bullseye_source_sha256="e47edd99dc25acc9a58e56e8878b06682f830e90a1d7c5d19cd6d186b9ad6a77"
 		fi
 		gitlab_source_sha256=$gitlab_arm_bullseye_source_sha256
 	fi