Skip to content

The gitlab-org/gitlab has master instead of main branch

João Alexandre Cunha requested to merge fix/gitlab-branch-for-upgrade-stops into master

What does this MR do and why?

In Move upgrade-path.yml location (!3148 - merged) we've moved the location of SSoT file for the upgrade stops.

But we forgot to move the branch name. In gitlab-org/gitlab we don't have a branch called main, but one called master instead.

Instead of hardcoding the branch to 'main' or 'master', we'll now delegate to ReleaseTools::Project::GitlabEe.default_branch, which actually has a logic to choose between main or master depending on a feature flag: https://gitlab.com/gitlab-org/release-tools/-/blob/123dfbb4f29c8dfc39e8ea8a305adcea9f3d61a6/lib/release_tools/project/gitlab_ee.rb#L43-49

Content

  • The monolith has master instead of main branch

Author Check-list

  • Has documentation been updated?
Edited by João Alexandre Cunha

Merge request reports