Merge tag 'debian/15.2.2+ds1-2' into bullseye-fasttrack

gitlab Debian release 15.2.2+ds1-2
This commit is contained in:
Pirate Praveen 2022-08-15 23:22:01 +05:30
commit ae7682b478
No known key found for this signature in database
GPG key ID: 8F53E0193B294B75
3 changed files with 12 additions and 6 deletions

8
debian/changelog vendored
View file

@ -1,3 +1,11 @@
gitlab (15.2.2+ds1-2) experimental; urgency=medium
* Use packaged version of ruby-gitlab-fog-azure-rm
* Install omniauth-oauth2 1.7.3 from rubygems.org
* Use packaged versions of graphql and gitlab-labkit
-- Pirate Praveen <praveen@debian.org> Mon, 15 Aug 2022 22:39:58 +0530
gitlab (15.2.2+ds1-1~fto11+1) bullseye-fasttrack; urgency=medium
* Rebuild for bullseye-fasttrack.

6
debian/control vendored
View file

@ -165,7 +165,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
ruby-grape-entity (>= 0.10~),
ruby-rack-cors (>= 1.0.6~),
# GraphQL API
ruby-graphql (>= 1.11.10~),
ruby-graphql (>= 1.13.12~),
ruby-graphiql-rails (>= 1.4.10~),
ruby-apollo-upload-server (>= 2.1~),
# Used by BulkImport feature (group::import)
@ -188,7 +188,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
ruby-fog-openstack (>= 1.0~),
ruby-fog-rackspace (>= 0.1.1~),
ruby-fog-aliyun (>= 0.3~),
ruby-gitlab-fog-azure-rm (>= 1.2~),
ruby-gitlab-fog-azure-rm (>= 1.3~),
ruby-azure-storage-blob (>= 2.0.0-3~),
ruby-azure-storage-common (>= 2.0.1-5~),
# for Google storage
@ -342,7 +342,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
#
ruby-premailer-rails (>= 1.10.3-2~),
# LabKit: Tracing and Correlation
ruby-gitlab-labkit (>= 0.21.3~),
ruby-gitlab-labkit (>= 0.23~),
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
ruby-thrift (>= 0.14~),

View file

@ -71,12 +71,9 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i "^gitlab-dangerfiles$" >/de
# TODO: Update packages for these gems
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 7.2 "^elasticsearch-model$" >/dev/null; then gem install -v 7.2 elasticsearch-model; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 7.2 "^elasticsearch-rails$" >/dev/null; then gem install -v 7.2 elasticsearch-rails; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 1.13.12 "^graphql$" >/dev/null; then gem install -v 1.13.12 graphql; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 3.14 "^fog-aws$" >/dev/null; then gem install -v 3.14 fog-aws; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 1.3 "^gitlab-fog-azure-rm$" >/dev/null; then gem install -v 1.3 gitlab-fog-azure-rm; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.6.0 "^rack-timeout$" >/dev/null; then gem install -v 0.6.0 rack-timeout; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 6.6 "^rack-attack$" >/dev/null; then gem install -v 6.6 rack-attack; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.23 "^gitlab-labkit$" >/dev/null; then gem install -v 0.23 gitlab-labkit; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 2.2 "^gitlab_omniauth-ldap$" >/dev/null; then gem install -v 2.2 gitlab_omniauth-ldap; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 3.131 "^aws-sdk-core$" >/dev/null; then gem install -v 3.131 aws-sdk-core; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 1.114 "^aws-sdk-s3$" >/dev/null; then gem install -v 1.114 aws-sdk-s3; fi"
@ -86,6 +83,7 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.16' "^prometheus-c
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 1.3' "^warning$" >/dev/null; then gem install -v '~> 1.3' warning; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 2.0' "^oauth2$" >/dev/null; then gem install -v '~> 2.0' oauth2; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 3.13, 3.13.19' "^oj$" >/dev/null; then gem install -v '~> 3.13' oj; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 1.0, >= 1.7.3' "^omniauth-oauth2$" >/dev/null; then gem install -v '~> 1.7.3' omniauth-oauth2; fi"
#######################################################################
# update Gemfile.lock and yarn.lock, always