From 13e856141ec14eff47569bb765a08cd1ea7d0f8d Mon Sep 17 00:00:00 2001 From: Pierre Belloy Date: Mon, 31 Dec 2018 15:40:40 +0100 Subject: [PATCH] ADD GITLAB_IMPERSONATION_ENABLED Signed-off-by: Pierre Belloy --- README.md | 1 + assets/runtime/config/gitlabhq/gitlab.yml | 3 +++ assets/runtime/env-defaults | 1 + assets/runtime/functions | 1 + 4 files changed, 6 insertions(+) diff --git a/README.md b/README.md index b4100672..890e09a6 100644 --- a/README.md +++ b/README.md @@ -876,6 +876,7 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_INCOMING_EMAIL_ADDRESS` | The incoming email address for reply by email. Defaults to the value of `IMAP_USER`, else defaults to `reply@example.com`. Please read the [reply by email](http://doc.gitlab.com/ce/incoming_email/README.html) documentation to currently set this parameter. | | `GITLAB_INCOMING_EMAIL_ENABLED` | Enable or disable gitlab reply by email feature. Defaults to the value of `IMAP_ENABLED`. | | `GITLAB_SIGNUP_ENABLED` | Enable or disable user signups (first run only). Default is `true`. | +| `GITLAB_IMPERSONATION_ENABLED` | Enable or disable impersonation. Defaults to `true`. | | `GITLAB_PROJECTS_LIMIT` | Set default projects limit. Defaults to `100`. | | `GITLAB_USERNAME_CHANGE` | Enable or disable ability for users to change their username. Defaults to `true`. | | `GITLAB_CREATE_GROUP` | Enable or disable ability for users to create groups. Defaults to `true`. | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 5fd56812..5f203dc0 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -118,6 +118,9 @@ production: &base # The default is 'shared/cache/archive/' relative to the root of the Rails app. repository_downloads_path: {{GITLAB_DOWNLOADS_DIR}} + ## Impersonation settings + impersonation_enabled: {{GITLAB_IMPERSONATION_ENABLED}} + ## Reply by email # Allow users to comment on issues and merge requests by replying to notification emails. # For documentation on how to set this up, see http://doc.gitlab.com/ce/administration/reply_by_email.html diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index f44751a1..3b1f5bc3 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -16,6 +16,7 @@ GITLAB_HTTPS=${GITLAB_HTTPS:-false} GITLAB_HOST=${GITLAB_HOST:-localhost} GITLAB_CI_HOST=${GITLAB_CI_HOST:-} GITLAB_PORT=${GITLAB_PORT:-} +GITLAB_IMPERSONATION_ENABLED=${GITLAB_IMPERSONATION_ENABLED:-true} if [[ $GITLAB_HTTPS == true ]]; then GITLAB_PORT=${GITLAB_PORT:-443} else diff --git a/assets/runtime/functions b/assets/runtime/functions index 929ee8f0..53e063c1 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1550,6 +1550,7 @@ configure_gitlab() { GITLAB_SSH_HOST \ GITLAB_SSH_PORT \ GITLAB_SIGNUP_ENABLED \ + GITLAB_IMPERSONATION_ENABLED \ GITLAB_PROJECTS_LIMIT \ GITLAB_USERNAME_CHANGE \ GITLAB_DEFAULT_THEME \