From a72ca86192c9d35928a4983150209dafc9c080f9 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 13 Jun 2018 10:56:38 +0530 Subject: [PATCH 1/2] Update default file for init script --- debian/conf/gitlab | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/conf/gitlab b/debian/conf/gitlab index 9918667d2a..651b242a7e 100755 --- a/debian/conf/gitlab +++ b/debian/conf/gitlab @@ -9,6 +9,7 @@ RAILS_ENV="production" # Read debian specific configuration . /etc/gitlab/gitlab-debian.conf +. /etc/gitlab-common/gitlab-common.conf for i in $(grep -v '#' /etc/gitlab/gitlab-debian.conf | cut -d= -f 1) do @@ -17,7 +18,7 @@ done # app_user defines the user that GitLab is run as. # The default is "git". -app_user=${gitlab_user} +export app_user=${gitlab_user} # app_root defines the folder in which gitlab and it's components are installed. # The default is "/home/$app_user/gitlab" From 4aedf560e724d96d339cb23bd885bc902fcf789b Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 13 Jun 2018 11:00:39 +0530 Subject: [PATCH 2/2] update changelog --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index a4248338fe..b7cd345bd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gitlab (10.7.5+dfsg-3) experimental; urgency=medium + + * Relax ruby version check (2.3.3 includes security fixes) + * Add gitlab-common binary to handle user creation for gitlab and gitaly + (Closes: #901310) + + -- Pirate Praveen Wed, 13 Jun 2018 10:57:34 +0530 + gitlab (10.7.5+dfsg-2) experimental; urgency=medium * Bump minimum version of gitlab-workhorse to 4.1.0