Merge tag 'debian/13.12.3+ds1-6' into buster-fasttrack
gitlab Debian release 13.12.3+ds1-6
This commit is contained in:
commit
801565bca1
3 changed files with 18 additions and 2 deletions
13
debian/changelog
vendored
13
debian/changelog
vendored
|
@ -1,3 +1,16 @@
|
||||||
|
gitlab (13.12.3+ds1-6) experimental; urgency=medium
|
||||||
|
|
||||||
|
* Move gem install to start of postinst, before regenerating Gemfile.lock
|
||||||
|
(Closes: #990103)
|
||||||
|
|
||||||
|
-- Pirate Praveen <praveen@debian.org> Mon, 21 Jun 2021 14:09:44 +0530
|
||||||
|
|
||||||
|
gitlab (13.12.3+ds1-5) experimental; urgency=medium
|
||||||
|
|
||||||
|
* Add workaround for #989774 (install google-protobuf from rubygems.org)
|
||||||
|
|
||||||
|
-- Pirate Praveen <praveen@debian.org> Mon, 21 Jun 2021 01:03:03 +0530
|
||||||
|
|
||||||
gitlab (13.12.3+ds1-4~fto10+1) buster-fasttrack; urgency=medium
|
gitlab (13.12.3+ds1-4~fto10+1) buster-fasttrack; urgency=medium
|
||||||
|
|
||||||
* Rebuild for buster-fasttrack.
|
* Rebuild for buster-fasttrack.
|
||||||
|
|
5
debian/gitlab.postinst
vendored
5
debian/gitlab.postinst
vendored
|
@ -61,6 +61,11 @@ export GEM_HOME=/var/lib/gitlab/.gem
|
||||||
# Read gitlab_user from gitlab-common.conf
|
# Read gitlab_user from gitlab-common.conf
|
||||||
test -f ${gitlab_common_conf} && . ${gitlab_common_conf}
|
test -f ${gitlab_common_conf} && . ${gitlab_common_conf}
|
||||||
|
|
||||||
|
# Workaround for #966653
|
||||||
|
/usr/bin/gem install -v 1.30.2 grpc
|
||||||
|
# Workaround for #989774
|
||||||
|
/usr/bin/gem install -v 3.17.1 google-protobuf
|
||||||
|
|
||||||
#######################################################################
|
#######################################################################
|
||||||
# update Gemfile.lock and yarn.lock, always
|
# update Gemfile.lock and yarn.lock, always
|
||||||
#######################################################################
|
#######################################################################
|
||||||
|
|
2
debian/rake-tasks.sh
vendored
2
debian/rake-tasks.sh
vendored
|
@ -8,8 +8,6 @@ export DB RAILS_ENV
|
||||||
|
|
||||||
cd /usr/share/gitlab
|
cd /usr/share/gitlab
|
||||||
|
|
||||||
# Workaround for #966653
|
|
||||||
/usr/bin/gem install -v 1.30.2 grpc
|
|
||||||
# Remove all lines from Gemfile.lock
|
# Remove all lines from Gemfile.lock
|
||||||
runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/Gemfile.lock && \
|
runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/Gemfile.lock && \
|
||||||
truncate -s 0 ${gitlab_data_dir}/Gemfile.lock"
|
truncate -s 0 ${gitlab_data_dir}/Gemfile.lock"
|
||||||
|
|
Loading…
Add table
Reference in a new issue