Merge remote-tracking branch 'dev/master'

Author: GitLab Release Tools Bot

CHANGELOG.md

@@ -3,6 +3,12 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
 
+## 16.11.2 (2024-05-07)
+
+### Fixed (1 change)
+
+- [Fix reconfigure failure if Redis node has Rails Sentinel config](gitlab-org/security/omnibus-gitlab@c097bfaf41a5081a4d22d99247c5dda5a8f7924e)
+
 ## 16.11.1 (2024-04-24)
 
 ### Fixed (1 change)
@@ -45,6 +51,10 @@ omnibus-gitlab repository.
 
 - [Use February 2024 PostgreSQL patches](gitlab-org/omnibus-gitlab@bc78ec9e2d91882439c574bc18eaddd08f17f8d1)
 
+## 16.10.5 (2024-05-07)
+
+No changes.
+
 ## 16.10.4 (2024-04-24)
 
 No changes.
@@ -119,6 +129,10 @@ No changes.
 
 - [Update Patroni to 3.0.1](gitlab-org/omnibus-gitlab@faba9e7605768373c4747fa7062ab36c7be74205) ([merge request](gitlab-org/omnibus-gitlab!6898))
 
+## 16.9.7 (2024-05-07)
+
+No changes.
+
 ## 16.9.6 (2024-04-24)
 
 No changes.

config/templates/package-scripts/preinst.erb

@@ -143,4 +143,4 @@ case "$1" in
   *)
     # This is not an upgrade, nothing to do.
     ;;
-esac
+esac

files/gitlab-ctl-commands/lib/gitlab_ctl/upgrade_check.rb

@@ -20,4 +20,4 @@ def min_version
       end
     end
   end
-end
+end