From df5c0386927fff836d2c889c605ae0ff7c187095 Mon Sep 17 00:00:00 2001
From: Kay0u <pierre.moltess@gmail.com>
Date: Tue, 10 Mar 2020 09:50:17 +0100
Subject: [PATCH] 12.8.5

---
 README.md                         | 2 +-
 conf/gitlab.rb                    | 6 ++++++
 manifest.json                     | 2 +-
 scripts/upgrade.d/upgrade.last.sh | 6 +++---
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 5026fa9..27c4d3a 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.8.2
+**Shipped version:** 12.8.5
 
 ## Screenshots
 
diff --git a/conf/gitlab.rb b/conf/gitlab.rb
index 8b023a7..c9bdc45 100644
--- a/conf/gitlab.rb
+++ b/conf/gitlab.rb
@@ -916,6 +916,11 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__
 # postgresql['ha'] = false
 # postgresql['dir'] = "/var/opt/gitlab/postgresql"
 # postgresql['log_directory'] = "/var/log/gitlab/postgresql"
+# postgresql['log_destination'] = nil
+# postgresql['logging_collector'] = nil
+# postgresql['log_truncate_on_rotation'] = nil
+# postgresql['log_rotation_age'] = nil
+# postgresql['log_rotation_size'] = nil
 # postgresql['username'] = "gitlab-psql"
 # postgresql['group'] = "gitlab-psql"
 ##! `SQL_USER_PASSWORD_HASH` can be generated using the command `gitlab-ctl pg-password-md5 gitlab`
@@ -1928,6 +1933,7 @@ grafana['enable'] = false
 # gitlab_rails['ldap_group_sync_worker_cron'] = "0 * * * *"
 # gitlab_rails['historical_data_worker_cron'] = "0 12 * * *"
 # gitlab_rails['pseudonymizer_worker_cron'] = "0 23 * * *"
+# gitlab_rails['elastic_index_bulk_cron'] = "*/1 * * * *"
 
 ################################################################################
 ## Kerberos (EE Only)
diff --git a/manifest.json b/manifest.json
index d69871e..84a058f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name": "Gitlab",
     "id": "gitlab",
     "packaging_format": 1,
-    "version": "12.8.2~ynh1",
+    "version": "12.8.5~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 f9c7a86..0f6d9a1 100644
--- a/scripts/upgrade.d/upgrade.last.sh
+++ b/scripts/upgrade.d/upgrade.last.sh
@@ -1,8 +1,8 @@
-gitlab_version="12.8.2"
+gitlab_version="12.8.5"
 
-gitlab_x86_64_source_sha256="6c45ab23f3b7abc927ac15035ace7bdf1692c65b5bb657686b8cc23f7fdcd6d7"
+gitlab_x86_64_source_sha256="ef9a55ca32f0d2450ce34f355debc01f3fcebc48ed389fd3ac82c76773bf7ec7"
 
-gitlab_arm_source_sha256="1476be7c19f85d90c6abf1254ba1f2d4380833934e2471f788d5179099eb1122"
+gitlab_arm_source_sha256="0fcb4b715430ac8b94eff186909d59de50188e33957ffdb6f30b11ca87bd80a6"
 
 gitlab_filename="gitlab-ce-${gitlab_version}.deb"