Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
5f025b490f
commit
8cc88269ff
|
@ -19,6 +19,7 @@ tasks:
|
||||||
# ensure gdk.yml has correct instance settings
|
# ensure gdk.yml has correct instance settings
|
||||||
gdk config set gitlab.rails.port 443
|
gdk config set gitlab.rails.port 443
|
||||||
gdk config set gitlab.rails.https.enabled true
|
gdk config set gitlab.rails.https.enabled true
|
||||||
|
gdk config set webpack.host 127.0.0.1
|
||||||
# make documentation builds available
|
# make documentation builds available
|
||||||
gdk config set gitlab_docs.enabled true
|
gdk config set gitlab_docs.enabled true
|
||||||
# reconfigure GDK
|
# reconfigure GDK
|
||||||
|
@ -47,6 +48,7 @@ tasks:
|
||||||
gdk config set gitlab.rails.hostname $(gp url 3000 | sed -e 's+^http[s]*://++')
|
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.port 443
|
||||||
gdk config set gitlab.rails.https.enabled true
|
gdk config set gitlab.rails.https.enabled true
|
||||||
|
gdk config set webpack.host 127.0.0.1
|
||||||
# reconfigure GDK
|
# reconfigure GDK
|
||||||
echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log
|
echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log
|
||||||
gdk reconfigure
|
gdk reconfigure
|
||||||
|
|
Loading…
Reference in New Issue