diff --git a/README.md b/README.md index 332eece..c3c8c54 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to GitLab is a web-based Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features, using an open-source license, developed by GitLab Inc. -**Shipped version:** 12.7.4 +**Shipped version:** 12.7.6 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 0c4edca..83632ba 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -148,6 +148,12 @@ external_url '__GENERATED_EXTERNAL_URL__' ###! request (default: 10) # gitlab_rails['webhook_timeout'] = 10 +### GraphQL Settings +###! Tells the rails application how long it has to complete a GraphQL request. +###! We suggest this value to be higher than the database timeout value +###! and lower than the worker timeout set in unicorn/puma. (default: 30) +# gitlab_rails['graphql_timeout'] = 30 + ### Trusted proxies ###! Customize if you have GitLab behind a reverse proxy which is running on a ###! different machine. @@ -1393,6 +1399,12 @@ nginx['listen_https'] = false # gitlab_pages['gitlab_server'] = nil # Defaults to external_url # gitlab_pages['auth_secret'] = nil # Generated if not present +##! GitLab API HTTP client connection timeout +# gitlab_pages['gitlab_client_http_timeout'] = "10s" + +##! GitLab API JWT Token expiry time" +# gitlab_pages['gitlab_client_jwt_expiry'] = "30s" + ##! Define custom gitlab-pages HTTP headers for the whole instance # gitlab_pages['headers'] = [] @@ -1780,8 +1792,8 @@ grafana['enable'] = false # gitaly['internal_socket_dir'] = "/var/opt/gitlab/gitaly" # gitaly['socket_path'] = "/var/opt/gitlab/gitaly/gitaly.socket" # gitaly['listen_addr'] = "localhost:8075" -# gitaly['tls_listen_addr] = "localhost:9075" -# gitaly['certificate_path'] = "/var/opt/gitlab/gitaly/certificate.pem' +# gitaly['tls_listen_addr'] = "localhost:9075" +# gitaly['certificate_path'] = "/var/opt/gitlab/gitaly/certificate.pem" # gitaly['key_path'] = "/var/opt/gitlab/gitaly/key.pem" # gitaly['prometheus_listen_addr'] = "localhost:9236" # gitaly['logging_level'] = "warn" @@ -1906,6 +1918,7 @@ grafana['enable'] = false # # gitlab_rails['geo_file_download_dispatch_worker_cron'] = "*/10 * * * *" # gitlab_rails['geo_repository_sync_worker_cron'] = "*/5 * * * *" +# gitlab_rails['geo_secondary_registry_consistency_worker'] = "* * * * *" # gitlab_rails['geo_prune_event_log_worker_cron'] = "*/5 * * * *" # gitlab_rails['geo_repository_verification_primary_batch_worker_cron'] = "*/5 * * * *" # gitlab_rails['geo_repository_verification_secondary_scheduler_worker_cron'] = "*/5 * * * *" @@ -2056,6 +2069,7 @@ grafana['enable'] = false # sidekiq_cluster['log_directory'] = "/var/log/gitlab/sidekiq-cluster" # sidekiq_cluster['interval'] = 5 # The number of seconds to wait between worker checks # sidekiq_cluster['max_concurrency'] = 50 # The maximum number of threads each Sidekiq process should run +# sidekiq_cluster['min_concurrency'] = 0 # The minimum number of threads each Sidekiq process should run ##! Each entry in the queue_groups array denotes a group of queues that have to be processed by a ##! Sidekiq process. Multiple queues can be processed by the same process by diff --git a/manifest.json b/manifest.json index 6202b80..427d033 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.7.4~ynh1", + "version": "12.7.6~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 9687ca7..06d17a3 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.7.4" +gitlab_version="12.7.6" -gitlab_x86_64_source_sha256="d6e425ffd161f763a442ed8e039d3fa6d1fb051d5bc7a36aae765c265d39b0c1" +gitlab_x86_64_source_sha256="b2452d5d83120b4226a3a26c4e1fa8a0cb2ac62833d971f32b3d844c70073a44" -gitlab_arm_source_sha256="2605a2253a80e5bf13aa675bee991ffc1f6a4b14adb977af80e8a5edfdc5cdd6" +gitlab_arm_source_sha256="1ca5be46e17784119b6714e5a5f8f0688da11f493f8a1cd847e47ef7c58c0554" gitlab_filename="gitlab-ce-${gitlab_version}.deb"