Merge branch 'master' into deps/5a89a91-3b3d888

changelogs/unreleased/sh-enable-wal-log-hints.yml

+---
+title: Expose wal_log_hints PostgreSQL setting
+merge_request: 4642
+author:
+type: added

changelogs/unreleased/sh-reduce-arm-build-size.yml

+---
+title: Reduce Ubuntu 20 ARM package size
+merge_request: 4637
+author:
+type: other

changelogs/unreleased/sh-remove-rbtrace-files.yml

+---
+title: Remove extraneous rbtrace files from build
+merge_request: 4647
+author:
+type: changed

changelogs/unreleased/sh-route-internal-api-workhorse.yml

+---
+title: Make Gitaly internal API calls go through Workhorse
+merge_request: 4592
+author:
+type: changed

config/projects/gitlab.rb

@@ -78,7 +78,13 @@ if rhel?
 end
 # Arm targets need libatomic
-runtime_dependency 'libatomic1' if OhaiHelper.arm?
+if OhaiHelper.arm?
+  if rhel?
+    runtime_dependency 'libatomic'
+  else
+    runtime_dependency 'libatomic1'
+  end
+end
 dependency 'git'
 dependency 'jemalloc'
@@ -117,6 +123,7 @@ dependency 'gitlab-shell'
 dependency 'gitlab-ctl'
 dependency 'gitlab-psql'
 dependency 'gitlab-redis-cli'
+dependency 'gitlab-kas'
 dependency 'gitlab-healthcheck'
 dependency 'gitlab-cookbooks'
 dependency 'chef-acme'
@@ -207,8 +214,14 @@ exclude 'embedded/lib/ruby/gems/*/gems/*/sample'
 exclude 'embedded/lib/ruby/gems/*/gems/*/script'
 exclude 'embedded/lib/ruby/gems/*/gems/*/t'
-# Exclude additional test files from specific gems
+# Exclude additional files from specific gems
+exclude 'embedded/lib/ruby/gems/*/gems/grpc-*/include'
+exclude 'embedded/lib/ruby/gems/*/gems/grpc-*/src/core'
+exclude 'embedded/lib/ruby/gems/*/gems/grpc-*/src/ruby/ext'
 exclude 'embedded/lib/ruby/gems/*/gems/grpc-*/src/ruby/spec'
+exclude 'embedded/lib/ruby/gems/*/gems/grpc-*/third_party'
+exclude 'embedded/lib/ruby/gems/*/gems/rbtrace-*/ext/src'
+exclude 'embedded/lib/ruby/gems/*/gems/rbtrace-*/ext/dst'
 # Enable signing packages
 package :rpm do

config/software/cacerts.rb

@@ -23,6 +23,7 @@ skip_transitive_dependency_licensing true
 # Date of the file is in a comment at the start, or in the changelog
 default_version '2020.01.01'
+display_version version.tr('.', '')
 version '2020.01.01' do
   source md5: 'c726ae88fd600aa26df1d30f42b51fec'

config/software/chef-bin.rb

 name 'chef-bin'
 # The version here should be in agreement with /Gemfile.lock so that our rspec
 # testing stays consistent with the package contents.
-default_version '15.12.22'
+default_version '15.14.0'
 license 'Apache-2.0'
 license_file 'LICENSE'

config/software/chef-gem.rb

@@ -17,7 +17,7 @@
 name 'chef-gem'
 # The version here should be in agreement with /Gemfile.lock so that our rspec
 # testing stays consistent with the package contents.
-default_version '15.12.22'
+default_version '15.14.0'
 license 'Apache-2.0'
 license_file 'LICENSE'

config/software/chef-zero.rb

@@ -17,7 +17,7 @@
 name 'chef-zero'
 # The version here should be in agreement with /Gemfile.lock so that our rspec
 # testing stays consistent with the package contents.
-default_version '15.0.0'
+default_version '15.0.3'
 license 'Apache-2.0'
 license_file 'LICENSE'

config/software/curl.rb

@@ -19,6 +19,7 @@ name 'curl'
 version = Gitlab::Version.new('curl', 'curl-7_59_0')
 default_version version.print(false)
+display_version version.print(false).delete_prefix('curl-').tr('_', '.')
 # Runtime dependency
 dependency 'zlib'

config/software/gitlab-cookbooks.rb

@@ -39,6 +39,7 @@ build do
   if EE
     cookbook_name = 'gitlab-ee'
     solo_recipes << 'geo-postgresql-config'
+    solo_recipes << 'patroni-config'
   else
     delete "#{install_dir}/embedded/cookbooks/gitlab-ee"
   end

config/software/gitlab-kas.rb

+#
+# Copyright:: Copyright (c) 2020 GitLab Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require "#{Omnibus::Config.project_root}/lib/gitlab/version"
+version = Gitlab::Version.new('gitlab-kas')
+
+name 'gitlab-kas'
+default_version version.print
+
+license 'MIT'
+license_file 'LICENSE'
+
+skip_transitive_dependency_licensing true
+
+source git: version.remote
+
+build do
+  env = { 'TARGET_DIRECTORY' => "#{Omnibus::Config.source_dir}/gitlab-kas/build" }
+
+  make 'kas', env: env
+  move 'build/kas', "#{install_dir}/embedded/bin/gitlab-kas"
+
+  command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=csv --save=license.csv"
+  copy "license.csv", "#{install_dir}/licenses/gitlab-kas.csv"
+end

config/software/gitlab-rails.rb

@@ -194,6 +194,7 @@ build do
     .git
     .gitignore
     spec
+    ee/spec
     features
     qa
     rubocop

config/software/krb5.rb

@@ -20,6 +20,7 @@ name 'krb5'
 version = Gitlab::Version.new('krb5', 'krb5-1.17')
 default_version version.print(false)
+display_version version.print(false).delete_prefix('krb5-')
 license 'MIT'
 license_file 'NOTICE'

config/software/libicu.rb

@@ -21,6 +21,7 @@ name 'libicu'
 version = Gitlab::Version.new('libicu', 'release-57-1')
 default_version version.print(false)
+display_version version.print(false).delete_prefix('release-').tr('-', '.')
 source git: version.remote

config/software/libre2.rb

@@ -20,6 +20,7 @@ name 'libre2'
 version = Gitlab::Version.new('libre2', '2016-02-01')
 default_version version.print(false)
+display_version version.print(false).tr('-', '')
 license 'BSD'
 license_file 'LICENSE'

config/software/mattermost.rb

@@ -17,10 +17,10 @@
 #
 name 'mattermost'
-default_version '5.26.2'
+default_version '5.27.0'
 source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
-       md5: '9c465a8a4cfaac2f2c7fc19a16c664d3'
+       md5: '4d407a020be6a9ace0e98b523d08c497'
 relative_path 'mattermost'

config/software/mixlib-log.rb

@@ -17,7 +17,7 @@
 name 'mixlib-log'
 # The version here should be in agreement with /Gemfile.lock so that our rspec
 # testing stays consistent with the package contents.
-default_version '3.0.8'
+default_version '3.0.9'
 license 'Apache-2.0'
 license_file 'LICENSE'

config/software/omnibus-ctl.rb

@@ -15,10 +15,9 @@
 #
 name 'omnibus-ctl'
-# Commit SHA of v0.6.0 is used because the tag is not pushed to the upstream
-# repo.  Change it to v0.6.0 when that happens.
-version = Gitlab::Version.new('omnibus-ctl', '1b96ac486636cac987e5b464810bb3ff673a93fe')
+version = Gitlab::Version.new('omnibus-ctl', 'v0.6.0')
 default_version version.print(false)
+display_version version.print(false)
 license 'Apache-2.0'
 license_file 'LICENSE'

config/software/openssl.rb

@@ -26,6 +26,7 @@ dependency 'cacerts'
 version = Gitlab::Version.new('openssl', 'OpenSSL_1_1_1h')
 default_version version.print(false)
+display_version version.print(false).delete_prefix('OpenSSL_').tr('_', '.')
 source git: version.remote