From 7aa615a4c087706bf82e2f3f73fa23fe9c66344a Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Fri, 20 Nov 2020 12:38:31 +0000 Subject: [PATCH] Use the 'main' branch for gitlab-shell nightlies GitLab Shell is transitioning from master to main. Until complete, we are keeping the two branches in sync manually, but all changes are merged to main first. This should result in nightlies being built from main, if I'm understanding how that works correctly. --- GITLAB_SHELL_VERSION | 2 +- changelogs/unreleased/gitlab-shell-uses-main.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/gitlab-shell-uses-main.yml diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index 1f7391f92..ba2906d06 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -master +main diff --git a/changelogs/unreleased/gitlab-shell-uses-main.yml b/changelogs/unreleased/gitlab-shell-uses-main.yml new file mode 100644 index 000000000..d3888df02 --- /dev/null +++ b/changelogs/unreleased/gitlab-shell-uses-main.yml @@ -0,0 +1,5 @@ +--- +title: Use the 'main' branch for gitlab-shell nightlies +merge_request: 4772 +author: +type: other