diff --git a/debian/control b/debian/control index 2684de295f..77dcc03b91 100644 --- a/debian/control +++ b/debian/control @@ -106,6 +106,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-saml (>= 1.12.1~), ruby-omniauth (>= 1.8~), ruby-omniauth-auth0 (>= 2.0~), + ruby-omniauth-azure-activedirectory-v2, ruby-omniauth-azure-oauth2 (>= 0.0.10~), ruby-omniauth-cas3 (>= 1.1.4~), ruby-omniauth-facebook (>= 4.0~), @@ -140,6 +141,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-acme-client (>= 2.0.6~), # Browser detection ruby-browser (>= 4.2~), +# OS detection for usage ping + ohai (>= 16.10~), # GPG ruby-gpgme (>= 2.0.19~), # LDAP Auth @@ -151,7 +154,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-grape-entity (>= 0.8~), ruby-rack-cors (>= 1.0.6~), # GraphQL API - ruby-graphql (>= 1.11.4~), + ruby-graphql (>= 1.11.8~), ruby-graphiql-rails (>= 1.4.10~), ruby-apollo-upload-server (>= 2.0.3~), # Used by BulkImport feature (group::import) @@ -166,15 +169,15 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-carrierwave (>= 1.3~), ruby-mini-magick (>= 4.10.1~), # for backups - ruby-fog-aws (>= 3.7~), + ruby-fog-aws (>= 3.9~), ruby-fog-core (>= 2.1~), ruby-excon (>= 0.72~), - ruby-fog-google (>= 1.12~), + ruby-fog-google (>= 1.13~), ruby-fog-local (>= 0.6~), ruby-fog-openstack (>= 1.0~), ruby-fog-rackspace (>= 0.1.1~), ruby-fog-aliyun (>= 0.3~), - ruby-gitlab-fog-azure-rm (>= 1.0~), + ruby-gitlab-fog-azure-rm (>= 1.0.1~), ruby-azure-storage-blob (>= 2.0.0-3~), ruby-azure-storage-common (>= 2.0.1-5~), # for Google storage @@ -259,7 +262,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-redis-activesupport (>= 5.2~), ruby-redis-actionpack (>= 5.2~), # Discord integration - ruby-discordrb-webhooks (>= 3.3~), + ruby-discordrb-webhooks (>= 3.4~), # JIRA integration ruby-jira (>= 2.1.4~), # Flowdock integration @@ -325,7 +328,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # ruby-premailer-rails (>= 1.10.3-2~), # LabKit: Tracing and Correlation - ruby-gitlab-labkit (>= 0.15~), + ruby-gitlab-labkit (>= 0.16.1~), # 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~), @@ -336,7 +339,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-gettext-i18n-rails-js (>= 1.3~), ruby-gettext (>= 3.3.3~), # - ruby-batch-loader (>= 1.4~), + ruby-batch-loader (>= 2.0.1~), # Perf bar ruby-peek (>= 1.1~), # Snowplow events tracking @@ -389,7 +392,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-flipper-active-record (>= 0.17.1~), ruby-flipper-active-support-cache-store (>= 0.17.1~), ruby-unleash (>= 0.1.5~), - ruby-gitlab-experiment (>= 0.4.4~), + ruby-gitlab-experiment (>= 0.5~), # Structured logging ruby-lograge (>= 0.10~), ruby-grape-logging (>= 1.7~), @@ -495,7 +498,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # gitlab-sidekiq was failing without puma puma Recommends: certbot, - gitaly (>= 13.9~) + gitaly (>= 13.10~) Conflicts: libruby2.5 Description: git powered software platform to collaborate on code (non-omnibus) gitlab provides web based interface to host source code and track issues. diff --git a/debian/patches/0499-91-relax-omniauth-azure-activedirectory-v2.patch b/debian/patches/0499-91-relax-omniauth-azure-activedirectory-v2.patch new file mode 100644 index 0000000000..6c14355106 --- /dev/null +++ b/debian/patches/0499-91-relax-omniauth-azure-activedirectory-v2.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -32,7 +32,7 @@ + gem 'ruby-saml', '~> 1.12', '>= 1.12.1' + gem 'omniauth', '~> 1.8' + gem 'omniauth-auth0', '~> 2.0' +-gem 'omniauth-azure-activedirectory-v2', '~> 0.1' ++gem 'omniauth-azure-activedirectory-v2', '~> 1.0' + gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version + gem 'omniauth-cas3', '~> 1.1', '>= 1.1.4' + gem 'omniauth-facebook', '~> 4.0' diff --git a/debian/patches/series b/debian/patches/series index 602bc0f260..5df7ca4239 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,6 +17,7 @@ 0499-40-relax-rouge.patch 0499-70-relax-graphlient.patch 0499-90-relax-webrick.patch +0499-91-relax-omniauth-azure-activedirectory-v2.patch 0500-set-webpack-root.patch 0510-remove-dev-dependencies.patch 0520-add-system-lib-path-for-webpack.patch