Merged and adapted upstream 16.1 CE branching point
also matching `BUILDER_IMAGE_REVISION` and `BUNDLER_VERSION` In d14fa645b774, upstream makes the underscore the norm in configuration nodes (whereas service names keep their hyphens). This breaks access for `hg-inner-http` such as done in the enabling loop of `files/gitlab-cookbooks/gitlab/recipes/default.rb`, so we had to correct by using the `hg_inner_http` key. There were conflicts in `lib/gitlab/build/info.rb`, with upstream implementing more changes to what `latest_tag` really means, on stable branches (excluding rc releases), when tags don't exist yet etc. These are all irrelevant to our builds, but we may want to check what they are doing for inspiration later on.
No related branches found
No related tags found
Showing
- .custom_sources.yml 3 additions, 0 deletions.custom_sources.yml
- .gitlab-ci.yml 4 additions, 4 deletions.gitlab-ci.yml
- .gitlab/CODEOWNERS 1 addition, 1 deletion.gitlab/CODEOWNERS
- .gitlab/merge_request_templates/Default.md 1 addition, 0 deletions.gitlab/merge_request_templates/Default.md
- .markdownlint.yml 2 additions, 1 deletion.markdownlint.yml
- .tool-versions 1 addition, 0 deletions.tool-versions
- CHANGELOG.md 140 additions, 0 deletionsCHANGELOG.md
- Gemfile 1 addition, 1 deletionGemfile
- Gemfile.lock 21 additions, 20 deletionsGemfile.lock
- OMNIBUS_GEM_VERSION 1 addition, 1 deletionOMNIBUS_GEM_VERSION
- config/patches/nginx/CVE-2021-3618.patch 0 additions, 80 deletionsconfig/patches/nginx/CVE-2021-3618.patch
- config/patches/ruby-grpc/grpc-system-ssl-1.42.0.patch 26 additions, 0 deletionsconfig/patches/ruby-grpc/grpc-system-ssl-1.42.0.patch
- config/patches/ruby-grpc/grpc-system-ssl-1.48.0.patch 26 additions, 0 deletionsconfig/patches/ruby-grpc/grpc-system-ssl-1.48.0.patch
- config/patches/ruby-grpc/grpc-system-ssl.patch 0 additions, 26 deletionsconfig/patches/ruby-grpc/grpc-system-ssl.patch
- config/patches/ruby/fix-ruby-xfree-for-libxml2-2.7.patch 23 additions, 0 deletionsconfig/patches/ruby/fix-ruby-xfree-for-libxml2-2.7.patch
- config/patches/ruby/fix-ruby-xfree-for-libxml2-3.0.patch 23 additions, 0 deletionsconfig/patches/ruby/fix-ruby-xfree-for-libxml2-3.0.patch
- config/patches/ruby/fix-ruby-xfree-for-libxml2-3.1.patch 23 additions, 0 deletionsconfig/patches/ruby/fix-ruby-xfree-for-libxml2-3.1.patch
- config/patches/ruby/fix-ruby-xfree-for-libxml2-3.2.patch 23 additions, 0 deletionsconfig/patches/ruby/fix-ruby-xfree-for-libxml2-3.2.patch
- config/software/chef-gem.rb 10 additions, 4 deletionsconfig/software/chef-gem.rb
- config/software/consul.rb 1 addition, 1 deletionconfig/software/consul.rb
Loading
Please register or sign in to comment