Skip to content
Snippets Groups Projects
Commit e6b179a5 authored by Mayra Cabrera's avatar Mayra Cabrera
Browse files

Merge branch 'sync-master-with-gitlab-org/omnibus-gitlab' into 'master'

parents 566f0fb3 81e754b0
No related branches found
No related tags found
3 merge requests!119heptapod#1448: making Heptapod 1.1 the new oldstable,!116heptapod#1395: make 1.1 the new stable,!115Merged upstream 16.7 stable branches first commit
......@@ -61,7 +61,7 @@
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"
......
......@@ -632,4 +632,4 @@
yard
BUNDLED WITH
2.4.13
2.4.22
......@@ -18,6 +18,6 @@
name 'mattermost'
default_version '9.1.3'
default_version '9.2.2'
source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
......@@ -22,6 +22,6 @@
source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
sha256: '70e7fc8e9abf3f4d756da76cbd6d3333d3cf98a30f8b91d1a38f0c660698e8c0'
sha256: 'ff42d71d8aa4189b3b8af77b5c622352d467960b19c8398c6f7d6614420ef607'
relative_path 'mattermost'
license_name = 'GITLAB-MATTERMOST-COMPILED-LICENSE.txt'
......
......@@ -123,9 +123,9 @@
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'
......@@ -127,8 +127,20 @@
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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment