Skip to content
Snippets Groups Projects
Commit 0f15def156c6 authored by Georges Racinet's avatar Georges Racinet
Browse files

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
1 merge request!100Upstream Merge of 16.1 CE branching point
Showing
with 330 additions and 139 deletions
Loading
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