Add latest changes from gitlab-org/gitlab@master

.gitpod.yml

@@ -16,8 +16,7 @@ tasks:
         # 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
-        # update gdk.yml
+        # 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
         gdk config set gitlab.rails.https.enabled true
         # reconfigure GDK
@@ -42,6 +41,13 @@ tasks:
           echo "$(date) – Updating GDK" | tee -a /workspace/startup.log
           gdk update
         fi
+        # 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
+        gdk config set gitlab.rails.https.enabled true
+        # reconfigure GDK
+        echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log
+        gdk reconfigure
         # start GDK
         echo "$(date) – Starting GDK" | tee -a /workspace/startup.log
         export DEV_SERVER_PUBLIC_ADDR=$(gp url 3808)

app/assets/javascripts/environments/components/environments_table.vue

@@ -67,7 +67,7 @@ export default {
           spacing: 'section-10',
         },
         autoStop: {
-          title: s__('Environments|Auto stop in'),
+          title: s__('Environments|Auto stop'),
           spacing: 'section-10',
         },
         actions: {

locale/gitlab.pot

@@ -12984,7 +12984,7 @@ msgstr ""
 msgid "Environments|Are you sure you want to stop this environment?"
 msgstr ""
 
-msgid "Environments|Auto stop in"
+msgid "Environments|Auto stop"
 msgstr ""
 
 msgid "Environments|Auto stops %{autoStopAt}"