diff --git a/debian/changelog b/debian/changelog index 33c17ae532..7e032d884d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,17 @@ +gitlab (14.2.6+ds1-2) experimental; urgency=medium + + * Switch to bash for quotes support in arguments for gitlab-rake + * Update prior-version in maintscript for rm_conffile + + -- Pirate Praveen Thu, 04 Nov 2021 02:03:07 +0530 + gitlab (14.2.6+ds1-1~fto11+1) bullseye-fasttrack; urgency=medium * Rebuild for bullseye-fasttrack. -- Pirate Praveen Mon, 01 Nov 2021 21:17:13 +0530 -gitlab (14.2.6+ds1-1) UNRELEASED; urgency=medium +gitlab (14.2.6+ds1-1) experimental; urgency=medium * New upstream version 14.2.5+ds1 * Refresh patches @@ -13,8 +20,17 @@ gitlab (14.2.6+ds1-1) UNRELEASED; urgency=medium * Fix XS-Go-Import-Path (remove extra workhorse from import path) * Rename workhorse binary to gitlab-workhorse * New upstream version 14.2.6+ds1 + * Update minimum versions of gitaly, ruby-gitaly and gitlab-common + * Relax dependency on rails in Gemfile + * Update dependencies + * Remove obsolete maintscript + * Force specific version of monaco-editor-webpack-plugin for compatibility + * Update minimum version of ruby-unleash + * Use matching version of @tiptap/core in package.json + * Add a preinst script to check version of postgresql + * Tighten some tiptap extension versions too in package.json - -- Pirate Praveen Fri, 29 Oct 2021 22:02:11 +0530 + -- Pirate Praveen Thu, 04 Nov 2021 00:51:54 +0530 gitlab (14.1.7+ds1-2~fto11+1) bullseye-fasttrack; urgency=medium diff --git a/debian/gitlab-rake.sh b/debian/gitlab-rake.sh index a6a8b1bf52..dda61b5cd9 100755 --- a/debian/gitlab-rake.sh +++ b/debian/gitlab-rake.sh @@ -1,5 +1,5 @@ -#! /bin/sh - +#! /bin/bash +# Using bash for ${variable@Q} option for passing quotes from command line argument to rake set -e # Read debian specific configuration @@ -9,6 +9,4 @@ export DB RAILS_ENV cd /usr/share/gitlab -# Check gitlab is configured correctly -printf "Check if Gitlab is configured correctly...\n" -runuser -u ${gitlab_user} -- sh -c "/usr/bin/bundle exec rake $@" +runuser -u ${gitlab_user} -- sh -c "/usr/bin/bundle exec rake ${@@Q}" diff --git a/debian/maintscript b/debian/maintscript index 6571363788..eef1c4c7cd 100644 --- a/debian/maintscript +++ b/debian/maintscript @@ -313,4 +313,4 @@ rm_conffile /etc/gitlab/initializers/puma_client_tempfile_patch.rb 13.10.4+ds1-1 rm_conffile /etc/gitlab/initializers/action_dispatch_journey_formatter.rb 13.12.9+ds1-3 gitlab rm_conffile /etc/gitlab/initializers/labkit_middleware.rb 13.12.9+ds1-3 gitlab rm_conffile /etc/gitlab/initializers/mailer_retries.rb 13.12.9+ds1-3 gitlab -rm_conffile /etc/gitlab/initializers/transaction_metrics.rb 14.1.7+ds1-2 gitlab +rm_conffile /etc/gitlab/initializers/transaction_metrics.rb 14.1.7+ds1-2~ gitlab