From b76ae638462ab0f673e5915986070518dd3f9ad3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 19 Aug 2021 09:08:42 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-2-stable-ee

---
 .gitpod.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to '.gitpod.yml')

diff --git a/.gitpod.yml b/.gitpod.yml
index 0cb0e55c373..6b77ee18e1e 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -48,6 +48,8 @@ tasks:
           make gitlab-db-migrate
         fi
         cd /workspace/gitlab-development-kit/gitlab
+        # Display which branch we're on
+        git branch --show-current
         # Install Lefthook
         bundle exec lefthook install
         git checkout db/structure.sql
@@ -55,16 +57,24 @@ tasks:
         # Waiting for GitLab ...
         gp await-port 3000
         printf "Waiting for GitLab at $(gp url 3000) ..."
-        until $(curl -sNL $(gp url 3000) | grep -q "GitLab"); do printf '.'; sleep 5; done && echo ""
+        # Check /-/readiness which returns JSON, but we're only interested in the exit code
+        #
+        # We use http://localhost:3000 instead of the public hostname because 
+        # it's no longer possible to access as specific cookies are required
+        until curl --silent --no-buffer --fail http://localhost:3000/-/readiness > /dev/null 2>&1; do printf '.'; sleep 5; done && echo ""
         # Give Gitpod a few more seconds to set up everything ...
         sleep 5
         printf "$(date) – GitLab is up (took ~%.1f minutes)\n" "$((10*$SECONDS/60))e-1" | tee -a /workspace/startup.log
         gp preview $(gp url 3000) || true
+        # Speed up backend tests
+        export GITLAB_TEST_EAGER_LOAD=false
       )
 
 ports:
-  - port: 3000  # rails-web
+  - port: 2222  # sshd
     onOpen: ignore
+  - port: 3000  # rails-web
+    onOpen: notify
   - port: 3010  # gitlab-pages
     onOpen: ignore
   - port: 3808  # webpack
-- 
cgit v1.2.3