diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-27 18:08:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-27 18:08:59 +0000 |
| commit | f3b9e205bb8dc4f0e8ebff79cf364fede886014b (patch) | |
| tree | ce9819fa446271f94e32af2cca1c02d618c3d9aa /.gitpod.yml | |
| parent | 2b1e7f7dac0fa5d7bb3bdf415cec1b3c67ed77b0 (diff) | |
| download | gitlab-ce-f3b9e205bb8dc4f0e8ebff79cf364fede886014b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitpod.yml')
| -rw-r--r-- | .gitpod.yml | 9 |
1 files changed, 1 insertions, 8 deletions
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) ..." |