From 6e7dc3f9d6b95200abd1fcd5cc418a9ae9803e4c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 27 Jan 2021 09:09:01 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .gitpod.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to '.gitpod.yml')

diff --git a/.gitpod.yml b/.gitpod.yml
index dc1dbc1472d..a28a11d6612 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -13,7 +13,10 @@ tasks:
       (
         set -e
         cd /workspace/gitlab-development-kit
-        [[ ! -L /workspace/gitlab-development-kit/gitlab ]] && ln -fs /workspace/gitlab /workspace/gitlab-development-kit/gitlab
+        # GitLab FOSS
+        [[ -d /workspace/gitlab-foss ]] && ln -fs /workspace/gitlab-foss /workspace/gitlab-development-kit/gitlab
+        # GitLab
+        [[ -d /workspace/gitlab ]] && ln -fs /workspace/gitlab /workspace/gitlab-development-kit/gitlab
         mv /workspace/gitlab-development-kit/secrets.yml /workspace/gitlab-development-kit/gitlab/config
         # reconfigure GDK
         echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log
@@ -47,9 +50,11 @@ tasks:
         if [ "$GITLAB_RUN_DB_MIGRATIONS" == true ]; then
           make gitlab-db-migrate
         fi
-        cd ../gitlab
+        cd /workspace/gitlab-development-kit/gitlab
+        # Install Lefthook
+        bundle exec lefthook install
         git checkout db/structure.sql
-        cd ../gitlab-development-kit
+        cd /workspace/gitlab-development-kit
         # Waiting for GitLab ...
         gp await-port 3000
         printf "Waiting for GitLab at $(gp url 3000) ..."
-- 
cgit v1.2.1