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

gitlab Debian release 15.6.8+ds1-2
This commit is contained in:
Pirate Praveen 2023-02-28 19:53:08 +05:30
commit d9534baea3
No known key found for this signature in database
GPG key ID: 8F53E0193B294B75
3 changed files with 17 additions and 16 deletions

9
debian/changelog vendored
View file

@ -1,3 +1,12 @@
gitlab (15.6.8+ds1-2) experimental; urgency=medium
* Add ruby-hashie >= 5.0 to Depends
* Use ruby-sidekiq, ruby-asciidoctor-kroki, ruby-memory-profiler,
ruby-browser, gitlab-fog-azure-rm, gitlab-sidekiq-fetcher,
ruby-omniauth-google-oauth2 and ruby-oauth2 from archive.
-- Pirate Praveen <praveen@debian.org> Tue, 28 Feb 2023 17:23:21 +0530
gitlab (15.6.8+ds1-1~fto11+1) bullseye-fasttrack; urgency=medium
* Rebuild for bullseye-fasttrack.

16
debian/control vendored
View file

@ -110,7 +110,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
ruby-bootsnap (>= 1.13~),
ruby-responders (>= 3.0~),
ruby-sprockets (>= 3.7~),
ruby-view-component (>= 2.74~),
ruby-view-component (>= 2.74.1~),
ruby-default-value-for (>= 3.4~),
#ruby-mysql2 | ruby-pg,
ruby-pg (>= 1.4.3~),
@ -135,7 +135,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
ruby-omniauth-facebook (>= 4.0~),
ruby-omniauth-github (>= 2.0.1~),
ruby-omniauth-gitlab (>= 1.0.2~),
ruby-omniauth-google-oauth2 (>= 0.6~),
ruby-omniauth-google-oauth2 (>= 1.1~),
ruby-omniauth-kerberos (>= 0.3.0-3~),
ruby-omniauth-oauth2-generic (>= 0.2.2~),
ruby-omniauth-saml (>= 2.0~),
@ -163,7 +163,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
# GitLab Pages letsencrypt support
ruby-acme-client (>= 2.0.9~),
# Browser detection
ruby-browser (>= 4.2~),
ruby-browser (>= 5.3.1~),
# OS detection for usage ping
ohai (>= 16.13.0-2~),
# GPG
@ -200,7 +200,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.3~),
ruby-gitlab-fog-azure-rm (>= 1.4~),
ruby-azure-storage-blob (>= 2.0.0-3~),
ruby-azure-storage-common (>= 2.0.1-5~),
# for Google storage
@ -235,7 +235,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
asciidoctor (>= 2.0.17~),
ruby-asciidoctor-include-ext (>= 0.4~),
ruby-asciidoctor-plantuml (>= 0.0.16~),
ruby-asciidoctor-kroki (>= 0.5~),
ruby-asciidoctor-kroki (>= 0.7~),
ruby-rouge (>= 3.29~),
ruby-truncato (>= 0.7.12~),
ruby-bootstrap-form (>= 4.2~),
@ -258,7 +258,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
# Issue tags
ruby-acts-as-taggable-on (>= 9.0~),
# Background jobs
ruby-sidekiq (>= 6.4~),
ruby-sidekiq (>= 6.5.7~),
ruby-sidekiq-cron (>= 1.8~),
ruby-redis-namespace (>= 1.8.1~),
ruby-gitlab-sidekiq-fetcher (>= 0.8~),
@ -388,11 +388,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
ruby-prof (>= 1.3~),
ruby-stackprof (>= 0.2.21~),
ruby-rbtrace (>= 0.4~),
ruby-memory-profiler (>= 0.9~),
ruby-memory-profiler (>= 1.0~),
ruby-benchmark-memory (>= 0.1~),
ruby-activerecord-explain-analyze (>= 0.1~),
# OAuth
ruby-oauth2 (>= 1.4.4~),
ruby-oauth2 (>= 2.0~),
# oauth2 2.0 is installed from rubygems.org
ruby-omniauth-oauth2 (>= 1.7.3~),
# Health check

View file

@ -70,8 +70,6 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 8.4' "^danger$" >/de
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i "^gitlab-dangerfiles$" >/dev/null; then gem install gitlab-dangerfiles; fi"
# TODO: Update packages for these gems
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 1.1 "^omniauth-google-oauth2$" >/dev/null; then gem install -v 1.1 omniauth-google-oauth2; 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 '~> 0.0.12' "^arr-pm$" >/dev/null; then gem install -v '~> 0.0.12' arr-pm; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 1.9 "^redis-namespace$" >/dev/null; then gem install -v 1.9 redis-namespace; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.12' "^google-apis-monitoring_v3$" >/dev/null; then gem install -v '~>0.12' google-apis-monitoring_v3; fi"
@ -82,14 +80,8 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.4 "google-apis-core$"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.14' "^google-apis-compute_v1$" >/dev/null; then gem install -v '~> 0.14' google-apis-compute_v1; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.13' "^google-apis-sqladmin_v1beta4$" >/dev/null; then gem install -v '~> 0.13' google-apis-sqladmin_v1beta4; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.7' "^google-apis-pubsub_v1$" >/dev/null; then gem install -v '~> 0.7' google-apis-pubsub_v1; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 1.4.0' "^gitlab-fog-azure-rm$" >/dev/null; then gem install -v '~> 1.4.0' gitlab-fog-azure-rm; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '6.5.7' "^sidekiq$" >/dev/null; then gem install -v '6.5.7' sidekiq; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.7.0' "^asciidoctor-kroki$" >/dev/null; then gem install -v '~> 0.7.0' asciidoctor-kroki; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 2.0.0' "^invisible_captcha$" >/dev/null; then gem install -v '~> 2.0.0' invisible_captcha; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 5.3.1' "^browser$" >/dev/null; then gem install -v '~> 5.3.1' browser; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 1.0' "^memory_profiler$" >/dev/null; then gem install -v '~> 1.0' memory_profiler; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 1.19' "^fog-google$" >/dev/null; then gem install -v '~> 1.19' fog-google; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.9.0 "^gitlab-sidekiq-fetcher$" >/dev/null; then gem install -v 0.9.0 gitlab-sidekiq-fetcher; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.29.0 "^gitlab-labkit$" >/dev/null; then gem install -v 0.29.0 gitlab-labkit; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 1.2.2 "^ipaddr$" >/dev/null; then gem install -v 1.2.2 ipaddr; fi"
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 2.3.2 "^deckar01-task_list$" >/dev/null; then gem install -v 2.3.2 deckar01-task_list; fi"