From aa10ebcf014b6ae7831b174c0ec77644957cc944 Mon Sep 17 00:00:00 2001
From: Peter Leitzen <peter@leitzen.de>
Date: Tue, 22 Oct 2019 10:41:14 +0200
Subject: [PATCH] Hide unused envvar DB_COLLATION

MySQL support was removed in https://github.com/sameersbn/docker-gitlab/pull/1961
and PostgreSQL doesn't support it anyway.
---
 assets/runtime/env-defaults | 1 -
 assets/runtime/functions    | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 7fef1ebd..38a78608 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -37,7 +37,6 @@ NGINX_HSTS_MAXAGE=${NGINX_HSTS_MAXAGE:-31536000}
 ## DATABASE
 DB_ADAPTER=${DB_ADAPTER:-postgresql}
 DB_ENCODING=${DB_ENCODING:-}
-DB_COLLATION=${DB_COLLATION:-}
 DB_HOST=${DB_HOST:-}
 DB_PORT=${DB_PORT:-}
 DB_NAME=${DB_NAME:-}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index d641c338..2665edc1 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -138,11 +138,9 @@ gitlab_finalize_database_parameters() {
   fi
 
   # set default port number if not specified
-
-  DB_ENCODING=${DB_ENCODING:-unicode}
-  # DB_COLLATION: Not supported for postgresql and will be removed below.
   DB_PORT=${DB_PORT:-5432}
 
+  DB_ENCODING=${DB_ENCODING:-unicode}
 
   # set default user and database
   DB_USER=${DB_USER:-root}