diff options
| author | James Lopez <james@gitlab.com> | 2017-03-07 16:50:08 +0000 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2017-03-07 16:50:08 +0000 |
| commit | ba3ce6bd39ffdcc03c1b435c8c69ddfc4ff688e2 (patch) | |
| tree | adbd7a6615b41d0cc9cc2fae334c1a670ada631a | |
| parent | f1073689b5d421c8f610b2f16994dd8af1f61d83 (diff) | |
| parent | bc70493b054702ecbe079a9f1c2b0bf3e6ccc40c (diff) | |
| download | gitlab-ce-ba3ce6bd39ffdcc03c1b435c8c69ddfc4ff688e2.tar.gz | |
Merge branch 'rfr-20170307-change-default-project-number-limit' into 'master'
Change project count limit from 10 to 100000
See merge request !9767
| -rw-r--r-- | changelogs/unreleased/rfr-20170307-change-default-project-number-limit.yml | 4 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 2 | ||||
| -rw-r--r-- | doc/api/settings.md | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/changelogs/unreleased/rfr-20170307-change-default-project-number-limit.yml b/changelogs/unreleased/rfr-20170307-change-default-project-number-limit.yml new file mode 100644 index 00000000000..e799dd3b48d --- /dev/null +++ b/changelogs/unreleased/rfr-20170307-change-default-project-number-limit.yml @@ -0,0 +1,4 @@ +--- +title: Change project count limit from 10 to 100000 +merge_request: +author: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 933844e4ea6..91d01423e6c 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -186,7 +186,7 @@ Settings['issues_tracker'] ||= {} # GitLab # Settings['gitlab'] ||= Settingslogic.new({}) -Settings.gitlab['default_projects_limit'] ||= 10 +Settings.gitlab['default_projects_limit'] ||= 100000 Settings.gitlab['default_branch_protection'] ||= 2 Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil? Settings.gitlab['host'] ||= ENV['GITLAB_HOST'] || 'localhost' diff --git a/doc/api/settings.md b/doc/api/settings.md index 38a37cd920c..ad975e2e325 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -20,7 +20,7 @@ Example response: ```json { - "default_projects_limit" : 10, + "default_projects_limit" : 100000, "signup_enabled" : true, "id" : 1, "default_branch_protection" : 2, @@ -60,7 +60,7 @@ PUT /application/settings | Attribute | Type | Required | Description | | --------- | ---- | :------: | ----------- | -| `default_projects_limit` | integer | no | Project limit per user. Default is `10` | +| `default_projects_limit` | integer | no | Project limit per user. Default is `100000` | | `signup_enabled` | boolean | no | Enable registration. Default is `true`. | | `signin_enabled` | boolean | no | Enable login via a GitLab account. Default is `true`. | | `gravatar_enabled` | boolean | no | Enable Gravatar | @@ -98,7 +98,7 @@ Example response: ```json { "id": 1, - "default_projects_limit": 10, + "default_projects_limit": 100000, "signup_enabled": true, "signin_enabled": true, "gravatar_enabled": true, |