gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'reformat-config-template' into 'master' 

Make config template scrapping-friendly

See merge request !1135
This commit is contained in:
Marin Jankovski 2016-12-23 10:50:12 +00:00
parent 3734663c21 f705dca09d
commit 92e5eedf62
2 changed files with 585 additions and 400 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/assets/gitlab-rb-location.patch
View File

@ -1,9 +1,9 @@
--- etc/gitlab.rb.template.bak 2015-09-22 20:55:42.088202003 +0000
+++ etc/gitlab.rb.template 2015-09-22 20:55:50.888202003 +0000
@@ -8,7 +8,7 @@
## URL on which GitLab will be reachable.
## For more details on configuring external_url see:
## https://docs.gitlab.com/omnibus/settings/configuration.html#configuring-the-external-url-for-gitlab
@@ -4,7 +4,7 @@
##! URL on which GitLab will be reachable.
##! For more details on configuring external_url see:
##! https://docs.gitlab.com/omnibus/settings/configuration.html#configuring-the-external-url-for-gitlab
-external_url 'GENERATED_EXTERNAL_URL'
+# external_url 'GENERATED_EXTERNAL_URL'

977
files/gitlab-config-template/gitlab.rb.template
View File

File diff suppressed because it is too large Load Diff