Merge tag 'debian/13.12.9+ds1-3' into buster-fasttrack
gitlab Debian release 13.12.9+ds1-3
This commit is contained in:
commit
0c4769bcfc
3 changed files with 18 additions and 12 deletions
14
debian/changelog
vendored
14
debian/changelog
vendored
|
@ -1,3 +1,17 @@
|
||||||
|
gitlab (13.12.9+ds1-3) experimental; urgency=medium
|
||||||
|
|
||||||
|
* Change ruby2.7 dependency to ruby (for scripts that needs ruby)
|
||||||
|
* Update minimum version of ruby-rqrcode-rails3 for 2FA fix
|
||||||
|
* Switch back to using ruby-grpc package (instead of rubygems.org version)
|
||||||
|
|
||||||
|
-- Pirate Praveen <praveen@debian.org> Tue, 10 Aug 2021 21:07:58 +0530
|
||||||
|
|
||||||
|
gitlab (13.12.9+ds1-2) experimental; urgency=medium
|
||||||
|
|
||||||
|
* Switch back to using packaged ruby-google-protobuf (see #992008)
|
||||||
|
|
||||||
|
-- Pirate Praveen <praveen@debian.org> Tue, 10 Aug 2021 01:05:43 +0530
|
||||||
|
|
||||||
gitlab (13.12.9+ds1-1~fto10+1) buster-fasttrack; urgency=medium
|
gitlab (13.12.9+ds1-1~fto10+1) buster-fasttrack; urgency=medium
|
||||||
|
|
||||||
* Rebuild for buster-fasttrack.
|
* Rebuild for buster-fasttrack.
|
||||||
|
|
9
debian/control
vendored
9
debian/control
vendored
|
@ -66,7 +66,7 @@ Architecture: all
|
||||||
XB-Ruby-Versions: ${ruby:Versions}
|
XB-Ruby-Versions: ${ruby:Versions}
|
||||||
Depends: ${shlibs:Depends}, ${misc:Depends},
|
Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||||
gitlab-common (>= 13.12~),
|
gitlab-common (>= 13.12~),
|
||||||
ruby2.7 (>= 2.7.2~),
|
ruby (>= 1:2.7~),
|
||||||
rubygems-integration (>= 1.18~),
|
rubygems-integration (>= 1.18~),
|
||||||
lsb-base (>= 3.0-6),
|
lsb-base (>= 3.0-6),
|
||||||
rake (>= 12.3.0~),
|
rake (>= 12.3.0~),
|
||||||
|
@ -133,7 +133,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||||
ruby-invisible-captcha (>= 1.1~),
|
ruby-invisible-captcha (>= 1.1~),
|
||||||
# Two-factor authentication
|
# Two-factor authentication
|
||||||
ruby-devise-two-factor (>= 4.0~),
|
ruby-devise-two-factor (>= 4.0~),
|
||||||
ruby-rqrcode-rails3 (>= 0.1.7~),
|
ruby-rqrcode-rails3 (>= 0.1.7-2~),
|
||||||
ruby-attr-encrypted (>= 3.1.0-3~),
|
ruby-attr-encrypted (>= 3.1.0-3~),
|
||||||
ruby-u2f (>= 0.2.1~),
|
ruby-u2f (>= 0.2.1~),
|
||||||
# GitLab Pages
|
# GitLab Pages
|
||||||
|
@ -383,9 +383,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||||
ruby-spamcheck,
|
ruby-spamcheck,
|
||||||
# Gitaly GRPC client
|
# Gitaly GRPC client
|
||||||
ruby-gitaly (>= 13.12~),
|
ruby-gitaly (>= 13.12~),
|
||||||
# See #966653
|
ruby-grpc (>= 1.30.2~),
|
||||||
# ruby-grpc (>= 1.30.2~),
|
ruby-google-protobuf (>= 3.17.3-1.1~),
|
||||||
# ruby-google-protobuf (>= 3.14~),
|
|
||||||
#
|
#
|
||||||
ruby-toml-rb (>= 1.0.0-2~),
|
ruby-toml-rb (>= 1.0.0-2~),
|
||||||
# Feature toggles
|
# Feature toggles
|
||||||
|
|
7
debian/gitlab.postinst
vendored
7
debian/gitlab.postinst
vendored
|
@ -37,13 +37,6 @@ test -f ${gitlab_common_defaults} && . ${gitlab_common_defaults}
|
||||||
# installation fails and the `postinst' is called with `abort-upgrade',
|
# installation fails and the `postinst' is called with `abort-upgrade',
|
||||||
# `abort-remove' or `abort-deconfigure'.
|
# `abort-remove' or `abort-deconfigure'.
|
||||||
|
|
||||||
# These gems should be installed as root for gitlab to find it
|
|
||||||
# Setting GEM_HOME seems not working for all cases, help welcome to fix it
|
|
||||||
# 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
|
|
||||||
|
|
||||||
#######################################################################
|
#######################################################################
|
||||||
# Read debian specific configuration
|
# Read debian specific configuration
|
||||||
#######################################################################
|
#######################################################################
|
||||||
|
|
Loading…
Reference in a new issue