Skip to content

Use the main branch for gitlab-shell

Nick Thomas requested to merge gitlab-shell-uses-main into master

What does this MR do?

GitLab, and the Git community more widely, is standardising on a new default branch name - main, replacing master. Renaming existing repositories is not necessary, but we're doing it for gitlab-shell anyway: gitlab-org/gitlab-shell#489 (closed)

The main branch already exists, and is the default, for the project. For now, we're manually keeping master up to date with it, but we'd like to remove master at some point so we no longer have to. First, we need to change all downstream users so they reference main instead of master.

Related issues

Omnibus change: gitlab-org/omnibus-gitlab!4772 (merged)

GitLab charts change: gitlab-org/charts/gitlab!1670 (merged)

Shell issues: gitlab-org/gitlab-shell#489 (closed)

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion

Required

  • Merge Request Title, and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Integration tests added to GitLab QA
  • The impact any change in container size has should be evaluated

Merge request reports