From ebba53fd34c7146de5cd416359cd3b834957733f Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sun, 17 May 2015 18:41:52 +0530 Subject: [PATCH] init: removed `GITLAB_PROJECTS_VISIBILITY` ENV parameter --- Changelog.md | 1 + README.md | 1 - assets/init | 4 ---- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Changelog.md b/Changelog.md index b0a0e648..cd2ebbae 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,7 @@ This file only reflects the changes that are made in the the docker image. Pleas - init: added `SIDEKIQ_SHUTDOWN_TIMEOUT` configuration option - gitlab-shell: upgrade to v.2.6.3 - gitlab: upgrade to CE v.7.11.0 +- init: removed `GITLAB_PROJECTS_VISIBILITY` ENV parameter **7.10.4** - gitlab: upgrade to CE v.7.10.4 diff --git a/README.md b/README.md index dc416a40..74cd7868 100644 --- a/README.md +++ b/README.md @@ -741,7 +741,6 @@ Below is the complete list of available options that can be used to customize yo - **GITLAB_PROJECTS_MERGE_REQUESTS**: Set if *merge requests* feature should be enabled by default for new projects. Defaults is `true`. - **GITLAB_PROJECTS_WIKI**: Set if *wiki* feature should be enabled by default for new projects. Defaults is `true`. - **GITLAB_PROJECTS_SNIPPETS**: Set if *snippets* feature should be enabled by default for new projects. Defaults is `false`. -- **GITLAB_PROJECTS_VISIBILITY**: Set default projects visibility level. Possible values `public`, `private` and `internal`. Defaults to `private`. - **GITLAB_WEBHOOK_TIMEOUT**: Sets the timeout for webhooks. Defaults to `10` seconds. - **GITLAB_SATELLITES_TIMEOUT**: Sets the timeout for satellites. Defaults to `30` seconds. - **GITLAB_TIMEOUT**: Sets the timeout for git commands. Defaults to `10` seconds. diff --git a/assets/init b/assets/init index 03540c5c..af1c15a3 100755 --- a/assets/init +++ b/assets/init @@ -28,7 +28,6 @@ GITLAB_PROJECTS_ISSUES=${GITLAB_PROJECTS_ISSUES:-true} GITLAB_PROJECTS_MERGE_REQUESTS=${GITLAB_PROJECTS_MERGE_REQUESTS:-true} GITLAB_PROJECTS_WIKI=${GITLAB_PROJECTS_WIKI:-true} GITLAB_PROJECTS_SNIPPETS=${GITLAB_PROJECTS_SNIPPETS:-false} -GITLAB_PROJECTS_VISIBILITY=${GITLAB_PROJECTS_VISIBILITY:-private} GITLAB_RELATIVE_URL_ROOT=${GITLAB_RELATIVE_URL_ROOT:-} GITLAB_WEBHOOK_TIMEOUT=${GITLAB_WEBHOOK_TIMEOUT:-10} GITLAB_SATELLITES_TIMEOUT=${GITLAB_SATELLITES_TIMEOUT:-30} @@ -367,9 +366,6 @@ sudo -u git -H sed 's/{{GITLAB_PROJECTS_WIKI}}/'"${GITLAB_PROJECTS_WIKI}"'/' -i # configure gitlab default project feature: snippets sudo -u git -H sed 's/{{GITLAB_PROJECTS_SNIPPETS}}/'"${GITLAB_PROJECTS_SNIPPETS}"'/' -i config/gitlab.yml -# configure gitlab default project feature: visibility_level -sudo -u git -H sed 's/{{GITLAB_PROJECTS_VISIBILITY}}/'"${GITLAB_PROJECTS_VISIBILITY}"'/' -i config/gitlab.yml - # configure gitlab webhook timeout sudo -u git -H sed 's/{{GITLAB_WEBHOOK_TIMEOUT}}/'"${GITLAB_WEBHOOK_TIMEOUT}"'/' -i config/gitlab.yml