diff --git a/debian/control b/debian/control index ec3287cab8..d7dcb3c43f 100644 --- a/debian/control +++ b/debian/control @@ -43,7 +43,7 @@ Build-Depends: debhelper-compat (= 13), golang-github-sebest-xff-dev, golang-github-sirupsen-logrus-dev, golang-github-stretchr-testify-dev (>= 1.4~), - golang-gitlab-gitlab-org-gitaly-dev (>= 15.3~), + golang-gitlab-gitlab-org-gitaly-dev (>= 15.4~), golang-github-beevik-ntp-dev, golang-gitlab-gitlab-org-labkit-dev (>= 1.14~), golang-gocloud-dev, @@ -95,7 +95,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-bootsnap (>= 1.13~), ruby-responders (>= 3.0~), ruby-sprockets (>= 3.7~), - ruby-view-component (>= 2.61~), + ruby-view-component (>= 2.71~), ruby-default-value-for (>= 3.4~), #ruby-mysql2 | ruby-pg, ruby-pg (>= 1.3~), @@ -106,7 +106,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # Authorization ruby-declarative-policy (>= 1.1), # Authentication libraries - ruby-devise (>= 4.7.1~), + ruby-devise (>= 4.8.1~), ruby-bcrypt (>= 3.1.14~), ruby-doorkeeper (>= 5.5~), ruby-doorkeeper-openid-connect (>= 1.7.5~), @@ -120,17 +120,18 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-omniauth-dingtalk-oauth2, ruby-omniauth-alicloud, ruby-omniauth-facebook (>= 4.0~), - ruby-omniauth-github (>= 1.4~), + ruby-omniauth-github (>= 2.0~), ruby-omniauth-gitlab (>= 1.0.2~), ruby-omniauth-google-oauth2 (>= 0.6~), ruby-omniauth-kerberos (>= 0.3.0-3~), ruby-omniauth-oauth2-generic (>= 0.2.2~), - ruby-omniauth-saml (>= 1.10~), + ruby-omniauth-saml (>= 2.0~), ruby-omniauth-shibboleth (>= 1.3~), ruby-omniauth-twitter (>= 1.4~), + ruby-omniauth-oauth (>= 1.2~), ruby-omniauth-crowd (>= 2.2~), ruby-omniauth-authentiq (>= 0.3.3~), - ruby-omniauth-openid-connect (>= 0.9~), + ruby-omniauth-openid-connect (>= 0.10~), ruby-omniauth-salesforce (>= 1.0.5~), ruby-omniauth-atlassian-oauth2 (>= 0.2.0~), ruby-rack-oauth2 (>= 1.21.2~), @@ -199,10 +200,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # Seed data ruby-seed-fu (>= 2.3.7~), # Search -# ruby-elasticsearch-model (>= 0.1.9~), embedded + ruby-elasticsearch-model (>= 7.2~), ruby-elasticsearch (>= 5.0.3~), -# ruby-elasticsearch-rails (>= 0.1.9~), embedded - ruby-elasticsearch-api (>= 6.8.2~), + ruby-elasticsearch-rails (>= 7.2~), + ruby-elasticsearch-api (>= 7.13.3~), ruby-aws-sdk-core (>= 3.131~), ruby-aws-sdk-cloudformation (>= 1.0~), ruby-aws-sdk-s3 (>= 1.114~), @@ -220,19 +221,19 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-org (>= 0.9.12-2~), ruby-creole (>= 0.5.0~), ruby-wikicloth (>= 0.8.1~), - asciidoctor (>= 2.0.10~), + asciidoctor (>= 2.0.17~), ruby-asciidoctor-include-ext (>= 0.4~), - ruby-asciidoctor-plantuml (>= 0.0.12~), + ruby-asciidoctor-plantuml (>= 0.0.16~), ruby-asciidoctor-kroki (>= 0.5~), ruby-rouge (>= 3.29~), ruby-truncato (>= 0.7.12~), ruby-bootstrap-form (>= 4.2~), - ruby-nokogiri (>= 1.13.6~), + ruby-nokogiri (>= 1.13.8~), ruby-escape-utils (>= 1.2.1~), # Calendar rendering ruby-icalendar, # Diffs - ruby-diffy (>= 3.3~), + ruby-diffy (>= 3.4~), ruby-diff-match-patch (>= 0.1~), # Application server ruby-rack (>= 2.2.4~), @@ -247,7 +248,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-acts-as-taggable-on (>= 9.0~), # Background jobs ruby-sidekiq (>= 6.4~), - ruby-sidekiq-cron (>= 1.2~), + ruby-sidekiq-cron (>= 1.4~), ruby-redis-namespace (>= 1.8.1~), ruby-gitlab-sidekiq-fetcher (>= 0.8~), # Cron Parser @@ -269,7 +270,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # User agent parsing ruby-device-detector, # Redis - ruby-redis (>= 4.4~), + ruby-redis (>= 4.7~), ruby-connection-pool (>= 2.0~), # Redis session store ruby-redis-actionpack (>= 5.3~), @@ -343,7 +344,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, 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~), + ruby-thrift (>= 0.16~), # I18n ruby-ruby-parser (>= 3.15~), ruby-whitequark-parser (>= 3.0~), @@ -374,7 +375,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-html2text, # ruby-prof (>= 1.3~), - ruby-stackprof (>= 0.2.15~), + ruby-stackprof (>= 0.2.21~), ruby-rbtrace (>= 0.4~), ruby-memory-profiler (>= 0.9~), ruby-benchmark-memory (>= 0.1~), @@ -393,9 +394,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # SSH keys support ruby-ssh-data (>= 1.2~), # Spamcheck GRPC protocol definitions - ruby-spamcheck, + ruby-spamcheck (>= 1.0~), # Gitaly GRPC client - ruby-gitaly (>= 15.3~), + ruby-gitaly (>= 15.4~), # KAS GRPC protocol definitions ruby-kas-grpc, # @@ -521,7 +522,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # gitlab-sidekiq was failing without puma puma Recommends: certbot, - gitaly (>= 15.3~), + gitaly (>= 15.4~), openssh-server Conflicts: libruby2.5 Description: git powered software platform to collaborate on code (non-omnibus) diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst index f8ccefcf0e..c5c36a6fb0 100755 --- a/debian/gitlab.postinst +++ b/debian/gitlab.postinst @@ -70,11 +70,9 @@ 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 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 "^omniauth-rails_csrf_protection$" >/dev/null; then gem install omniauth-rails_csrf_protection; 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 '~> 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.24.0' "^gitlab-labkit$" >/dev/null; then gem install -v '~> 0.24.0' gitlab-labkit; fi" runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.25' "^flipper$" >/dev/null; then gem install -v '~> 0.25' flipper; fi" runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.25' "^flipper-active_record$" >/dev/null; then gem install -v '~> 0.25' flipper-active_record; fi" runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.25' "^flipper-active_support_cache_store$" >/dev/null; then gem install -v '~> 0.25' flipper-active_support_cache_store; fi"