Sync changes from gitlab-org/omnibus-gitlab

Author: GitLab Bot

.gitlab-ci.yml

@@ -61,7 +61,7 @@ variables:
   CACHE_KEY_SUFFIX: '-v3'
   CACHE_EDITION: "CE"
   ISSUE_BOT_LABELS_EXTRA: "group::distribution"
-  BUNDLER_VERSION: "2.4.13"
+  BUNDLER_VERSION: "2.4.22"
   # NOTE: When `NEXT_RUBY_VERSION` is updated, flip
   # `USE_NEXT_RUBY_VERSION_IN_*` variables to false to avoid surprises.
   NEXT_RUBY_VERSION: "3.1.4"

Gemfile.lock

@@ -632,4 +632,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.4.13
+   2.4.22

config/software/mattermost.rb

@@ -18,10 +18,17 @@
 
 name 'mattermost'
 
+<<<<<<< HEAD
 default_version '9.1.3'
 
 source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
        sha256: '70e7fc8e9abf3f4d756da76cbd6d3333d3cf98a30f8b91d1a38f0c660698e8c0'
+=======
+default_version '9.2.2'
+
+source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
+       sha256: 'ff42d71d8aa4189b3b8af77b5c622352d467960b19c8398c6f7d6614420ef607'
+>>>>>>> source-project/master
 relative_path 'mattermost'
 
 license_name = 'GITLAB-MATTERMOST-COMPILED-LICENSE.txt'

deps.yml

@@ -123,12 +123,24 @@ dependencies:
         replace_in_files:
         - filename: config/software/remote-syslog.rb
           pattern: "default_version '(\\S+)'"
-      # rubygems
+      # rubygems and bundler
       https://github.com/rubygems/rubygems.git:
         replace_in_files:
         - filename: config/software/rubygems.rb
           pattern: "default_version '(\\S+)'"
           range: '<= 3.x'
+        - filename: .gitlab-ci.yml
+          pattern: 'BUNDLER_VERSION: "(\\S+)"'
+          tag_filter:
+            matching: 'bundler-v(\\S+)'
+            sort_as: '$1'
+          range: '<= 3.x'
+        - filename: Gemfile.lock
+          pattern: 'BUNDLED WITH\n   (\\S+)'
+          tag_filter:
+            matching: 'bundler-v(\\S+)'
+            sort_as: '$1'
+          range: '<= 3.x'
       # zlib
       https://github.com/madler/zlib.git:
         replace_in_files: