From f3b9e205bb8dc4f0e8ebff79cf364fede886014b Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 27 Oct 2020 18:08:59 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .gitpod.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to '.gitpod.yml')

diff --git a/.gitpod.yml b/.gitpod.yml
index d83e5ff3e61..2c6aa2a962d 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -14,6 +14,7 @@ tasks:
         set -e
         cd /workspace/gitlab-development-kit
         [[ ! -L /workspace/gitlab-development-kit/gitlab ]] && ln -fs /workspace/gitlab /workspace/gitlab-development-kit/gitlab
+        mv /workspace/gitlab-development-kit/secrets.yml /workspace/gitlab-development-kit/gitlab/config
         # make webpack static, prevents that GitLab tries to connect to localhost webpack from browser outside the workspace
         echo "webpack:" >> gdk.yml
         echo "  static: true" >> gdk.yml
@@ -48,14 +49,6 @@ tasks:
         if [ "$GITLAB_RUN_DB_MIGRATIONS" == true ]; then
           make gitlab-db-migrate
         fi
-        # Fix DB key
-        if [ "$GITLAB_FIX_DB_KEY" = true ]; then
-          echo "$(date) – Fixing DB key" | tee -a /workspace/startup.log
-          cd gitlab
-          # see https://gitlab.com/gitlab-org/gitlab-foss/-/issues/56403#note_132515069
-          printf 'ApplicationSetting.last.update_column(:runners_registration_token_encrypted, nil)\nexit\n' | bundle exec rails c
-          cd -
-        fi
         # Waiting for GitLab ...
         gp await-port 3000
         printf "Waiting for GitLab at $(gp url 3000) ..."
-- 
cgit v1.2.1