From 404895390afe87ce8ab939448bf7dff7dc4b7169 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 31 May 2023 21:09:09 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .gitpod.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to '.gitpod.yml')

diff --git a/.gitpod.yml b/.gitpod.yml
index 684f9a8e5a2..3ec5e59184b 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -51,14 +51,9 @@ tasks:
         [[ -f /workspace/gitpod_start_time.sh ]] && source /workspace/gitpod_start_time.sh
         SECONDS=0
         cd /workspace/gitlab-development-kit
-        make gitlab-update
-        make gitlab-shell-update
-        make gitlab-workhorse-update
         # update GDK
-        if [ "$GITLAB_UPDATE_GDK" == true ]; then
-          echo "$(date) – Updating GDK" | tee -a /workspace/startup.log
-          gdk update
-        fi
+        echo "$(date) – Updating GDK" | tee -a /workspace/startup.log
+        gdk update
         # ensure gdk.yml has correct instance settings
         gdk config set gitlab.rails.hostname $(gp url 3000 | sed -e 's+^http[s]*://++')
         gdk config set gitlab.rails.port 443
-- 
cgit v1.2.3