From 8ae36d93f1a63874b584f0488fde88c1fee999c4 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 16 Jun 2023 09:09:20 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .gitpod.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to '.gitpod.yml')

diff --git a/.gitpod.yml b/.gitpod.yml
index ac20429c08e..19785aba125 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -53,6 +53,8 @@ tasks:
         cd /workspace/gitlab-development-kit
         # update GDK
         echo "$(date) – Updating GDK" | tee -a /workspace/startup.log
+        export DEFAULT_BRANCH=$(git branch --show-current)
+        gdk config set gitlab.default_branch "$DEFAULT_BRANCH"
         gdk update
         # ensure gdk.yml has correct instance settings
         gdk config set gitlab.rails.hostname $(gp url 3000 | sed -e 's+^http[s]*://++')
@@ -74,7 +76,7 @@ tasks:
           make gitlab-db-migrate
         fi
         cd /workspace/gitlab-development-kit/gitlab
-        echo "--- on branch: $(git branch --show-current)"
+        echo "--- on branch: $DEFAULT_BRANCH"
         echo "--- installing lefthook"
         bundle exec lefthook install
         echo "--- resetting db/structure.sql"
-- 
cgit v1.2.3