Merge branch 'master' into stretch-backports

This commit is contained in:
Pirate Praveen 2018-06-13 11:55:24 +05:30
commit 76814de808
2 changed files with 11 additions and 2 deletions

10
debian/changelog vendored
View file

@ -1,9 +1,17 @@
gitlab (10.7.5+dfsg-2~bpo9+1) stretch-backports; urgency=medium
gitlab (10.7.5+dfsg-3~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
-- Pirate Praveen <praveen@debian.org> Sun, 03 Jun 2018 21:03:45 +0530
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 <praveen@debian.org> 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

3
debian/conf/gitlab vendored
View file

@ -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"