From 280b6368ece7b81732ef01c0ba8fa62852eb9e4d Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sun, 5 Jun 2016 15:18:52 +0530 Subject: [PATCH] added `GITLAB_PROJECTS_LIMIT` configuration option Closes #717 --- Changelog.md | 3 +++ README.md | 1 + assets/runtime/config/gitlabhq/gitlab.yml | 1 + assets/runtime/env-defaults | 1 + assets/runtime/functions | 1 + 5 files changed, 7 insertions(+) diff --git a/Changelog.md b/Changelog.md index ec8ce437..6c8c83f7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,9 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) for the list of changes in GitLab. +**latest** +- added `GITLAB_PROJECTS_LIMIT` configuration option + **8.8.3** - gitlab: upgrade to CE v8.8.3 diff --git a/README.md b/README.md index ac11f88b..0d953ae3 100644 --- a/README.md +++ b/README.md @@ -791,6 +791,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 curretly 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_PROJECTS_LIMIT**: Set default projects limit. Defaults to `100`. - **GITLAB_USERNAME_CHANGE**: Enable or disable ability for users to change their username. Defaults is `true`. - **GITLAB_CREATE_GROUP**: Enable or disable ability for users to create groups. Defaults is `true`. - **GITLAB_PROJECTS_ISSUES**: Set if *issues* feature should be enabled by default for new projects. Defaults is `true`. diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 903640b5..eded931d 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -70,6 +70,7 @@ production: &base # Email server smtp settings are in config/initializers/smtp_settings.rb.sample + default_projects_limit: {{GITLAB_PROJECTS_LIMIT}} default_can_create_group: {{GITLAB_CREATE_GROUP}} # default: true username_changing_enabled: {{GITLAB_USERNAME_CHANGE}} # default: true - User can change her username/namespace ## Default theme ID diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 7b3dafff..c056f18f 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -64,6 +64,7 @@ UNICORN_TIMEOUT=${UNICORN_TIMEOUT:-60} ## GITLAB_TIMEZONE=${GITLAB_TIMEZONE:-UTC} GITLAB_SIGNUP_ENABLED=${GITLAB_SIGNUP_ENABLED:-true} +GITLAB_PROJECTS_LIMIT=${GITLAB_PROJECTS_LIMIT:-100} GITLAB_USERNAME_CHANGE=${GITLAB_USERNAME_CHANGE:-true} GITLAB_CREATE_GROUP=${GITLAB_CREATE_GROUP:-true} GITLAB_PROJECTS_ISSUES=${GITLAB_PROJECTS_ISSUES:-true} diff --git a/assets/runtime/functions b/assets/runtime/functions index 1d41c9b9..bbe14877 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1134,6 +1134,7 @@ configure_gitlab() { GITLAB_SSH_HOST \ GITLAB_SSH_PORT \ GITLAB_SIGNUP_ENABLED \ + GITLAB_PROJECTS_LIMIT \ GITLAB_USERNAME_CHANGE \ GITLAB_CREATE_GROUP \ GITLAB_TIMEOUT