Merged upstream 16.7 stable branches first commit
First commit of the upstream stable branch because it sets component versions. As usual, resolution of conflicts in doc files done with a big axe. Decided to remove `spec/lib/gitlab/tasks/gitlab_com_spec.rb` entirely because there is really no point losing time fixing tests of a rake deploy task meant for gitlab.com
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 4 additions, 3 deletions.gitlab-ci.yml
- .gitlab/issue_templates/Security developer workflow.md 3 additions, 1 deletion.gitlab/issue_templates/Security developer workflow.md
- .gitlab/merge_request_templates/Security Release.md 0 additions, 2 deletions.gitlab/merge_request_templates/Security Release.md
- CHANGELOG.md 76 additions, 0 deletionsCHANGELOG.md
- GITALY_SERVER_VERSION 1 addition, 1 deletionGITALY_SERVER_VERSION
- GITLAB_KAS_VERSION 1 addition, 1 deletionGITLAB_KAS_VERSION
- GITLAB_PAGES_VERSION 1 addition, 1 deletionGITLAB_PAGES_VERSION
- GITLAB_SHELL_VERSION 1 addition, 1 deletionGITLAB_SHELL_VERSION
- Gemfile 1 addition, 1 deletionGemfile
- Gemfile.lock 38 additions, 38 deletionsGemfile.lock
- OMNIBUS_GEM_VERSION 1 addition, 1 deletionOMNIBUS_GEM_VERSION
- README.md 17 additions, 22 deletionsREADME.md
- config/patches/chef-gem/Version-17-EOL-detection.patch 0 additions, 29 deletionsconfig/patches/chef-gem/Version-17-EOL-detection.patch
- config/patches/exiftool/allowlist-types.patch 3 additions, 2 deletionsconfig/patches/exiftool/allowlist-types.patch
- config/projects/gitlab.rb 1 addition, 1 deletionconfig/projects/gitlab.rb
- config/software/chef-gem.rb 1 addition, 4 deletionsconfig/software/chef-gem.rb
- config/software/consul.rb 2 additions, 0 deletionsconfig/software/consul.rb
- config/software/curl.rb 1 addition, 1 deletionconfig/software/curl.rb
- config/software/exiftool.rb 1 addition, 1 deletionconfig/software/exiftool.rb
- config/software/gitlab-exporter.rb 1 addition, 1 deletionconfig/software/gitlab-exporter.rb
Loading