diff --git a/debian/control b/debian/control index 6b667daedd..ba93d21a56 100644 --- a/debian/control +++ b/debian/control @@ -108,9 +108,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-ipaddr (>= 1.2.5~), ruby-responders (>= 3.0~), ruby-sprockets (>= 3.7~), - ruby-view-component (>= 2.74.1~), -#ruby-mysql2 | ruby-pg, - ruby-pg (>= 1.4.6~), + ruby-view-component (>= 2.82~), + ruby-pg (>= 1.5.3~), + ruby-neighbor (>= 0.2.3~), ruby-rugged (>= 1.2~), ruby-grape-path-helpers (>= 1.7.1~), ruby-faraday (>= 1.0~), @@ -121,7 +121,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-devise (>= 4.8.1~), ruby-bcrypt (>= 3.1.14~), ruby-doorkeeper (>= 5.6.6~), - ruby-doorkeeper-openid-connect (>= 1.8.5~), + ruby-doorkeeper-openid-connect (>= 1.8.6~), ruby-rexml (>= 3.2.3.1~), ruby-saml (>= 1.13~), ruby-omniauth (>= 2.1~), @@ -217,9 +217,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-elasticsearch (>= 5.0.3~), ruby-elasticsearch-rails (>= 7.2~), ruby-elasticsearch-api (>= 7.13.3~), - ruby-aws-sdk-core (>= 3.170.0~), + ruby-aws-sdk-core (>= 3.172~), ruby-aws-sdk-cloudformation (>= 1.0~), - ruby-aws-sdk-s3 (>= 1.121.0~), + ruby-aws-sdk-s3 (>= 1.122~), ruby-faraday-middleware-aws-sigv4, ruby-typhoeus (>= 1.4~), # Markdown and HTML processing @@ -306,6 +306,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-http (>= 4.4~), # AI ruby-ruby-openai (>= 3.7~), + ruby-circuitbox (>= 2.0~), # Sanitize user input ruby-sanitize (>= 6.0~), ruby-babosa (>= 1.0.3~), @@ -354,7 +355,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # ruby-premailer-rails (>= 1.10.3-2~), # LabKit: Tracing and Correlation - ruby-gitlab-labkit (>= 0.31~), + ruby-gitlab-labkit (>= 0.32~), # 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.16~), @@ -373,8 +374,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-snowplow-tracker (>= 0.8~), # Metrics ruby-method-source (>= 1.0~), - ruby-webrick (>= 1.6.1~), - ruby-prometheus-client-mmap (>= 0.19~), + ruby-webrick (>= 1.8.1~), + ruby-prometheus-client-mmap (>= 0.23~), # ruby-warning (>= 1.3~), # @@ -408,7 +409,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # Gitaly GRPC client ruby-gitaly (>= 15.11~), # KAS GRPC protocol definitions - ruby-kas-grpc, + ruby-kas-grpc (>= 16~), # ruby-grpc (>= 1.42~), # diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst index 6edf6a32ac..887e5ca716 100755 --- a/debian/gitlab.postinst +++ b/debian/gitlab.postinst @@ -65,9 +65,6 @@ export GEM_PATH=$(gem env gempath) # Once bundler gets --prefer-local option (merged upstream) these will be automated # Updating these rubygem packages are complicated runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 1.8.0 "^graphiql-rails$" >/dev/null; then gem install -v 1.8.0 graphiql-rails; fi" -# gitlab-dangerfiles is required in Rakefile and has many dependencies -runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 8.4' "^danger$" >/dev/null; then gem install -v '~> 8.4' danger; fi" -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.44.0 "^google-cloud-storage$" >/dev/null; then gem install -v 1.44.0 google-cloud-storage; fi" @@ -80,7 +77,6 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.0.12' "^arr-pm$" > # we have a newer incompatible version in the archive runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.6.1' "^omniauth_openid_connect$" >/dev/null; then gem install -v '~> 0.6.1' omniauth_openid_connect; fi" runuser -u ${gitlab_user} -- sh -c "if ! gem list -i "^app_store_connect$" >/dev/null; then gem install app_store_connect; 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" # Packaged version is probably buggy - task lists on issues broken 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" # We need this version to use newer googleauth @@ -100,6 +96,9 @@ fi # https://github.com/fog/fog-google/issues/421 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 2.1.0 "^fog-core$" >/dev/null; then gem install -v 2.1.0 fog-core; fi" +# new gem +runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.0.17.pre.alpha1 "^devfile$" >/dev/null; then gem install -v 0.0.17.pre.alpha1 devfile; fi" + ####################################################################### # update Gemfile.lock and yarn.lock, always #######################################################################