Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-06-16 12:09:20 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-06-16 12:09:20 +0300
commit8ae36d93f1a63874b584f0488fde88c1fee999c4 (patch)
treef1788ba1a7fb00248ff008f817f6feea89304339 /.gitpod.yml
parentb394e58cc2e52e17e7991e3d7b705aa383c362ee (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitpod.yml')
-rw-r--r--.gitpod.yml4
1 files changed, 3 insertions, 1 deletions
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"