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

Allow configuration of prepared statement caching in Rails 

Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/20723
Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/25505
This commit is contained in:
Bence Nagy 2016-12-15 10:15:13 +01:00 committed by Balasankar C
parent d1a3d84507
commit 169891c208
No known key found for this signature in database
GPG Key ID: 96EDAB9B2E6B7171
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -11,6 +11,7 @@ are not the same (O Schwede) c4e83c5
- Add configuration options for GitLab container registry to support notification endpoints to template (Alexandre Gomes) ef9b0f255
- Update curl to 7.53.0 38aea7179
- Update directory configuration structure to allow multiple settings per data directory
<<<<<<< HEAD
- Remove mailroom configuration template, reuse the default from GitLab 5511b246
- Remove deprecated standalone GitLab CI configuration ad126ba
- Expose configuration for HSTS which was removed from GitLab Rails f5919f
@ -33,6 +34,7 @@ are not the same (O Schwede) c4e83c5
- Gitaly service on by default 350dea
- Update Nginx to 1.10.3
- Added support for configuring hosts for database load balancing
- Allow configuration of prepared statement caching in Rails
8.17.3

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

@ -335,6 +335,8 @@ external_url 'GENERATED_EXTERNAL_URL'
# gitlab_rails['db_socket'] = nil
# gitlab_rails['db_sslmode'] = nil
# gitlab_rails['db_sslrootcert'] = nil
# gitlab_rails['db_prepared_statements'] = true
# gitlab_rails['db_statements_limit'] = 1000
### GitLab Redis settings

2
files/gitlab-cookbooks/gitlab/attributes/default.rb
View File

@ -245,6 +245,8 @@ default['gitlab']['gitlab-rails']['db_socket'] = nil
default['gitlab']['gitlab-rails']['db_sslmode'] = nil
default['gitlab']['gitlab-rails']['db_sslrootcert'] = nil
default['gitlab']['gitlab-rails']['db_sslca'] = nil
default['gitlab']['gitlab-rails']['db_prepared_statements'] = true
default['gitlab']['gitlab-rails']['db_statements_limit'] = 1000
default['gitlab']['gitlab-rails']['redis_host'] = "127.0.0.1"
default['gitlab']['gitlab-rails']['redis_port'] = nil

2
files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb
View File

@ -17,3 +17,5 @@ production:
sslrootcert: <%= single_quote(@db_sslrootcert) || single_quote(@db_sslca) %>
sslca: <%= single_quote(@db_sslca) || single_quote(@db_sslrootcert) %>
load_balancing: <%= @db_load_balancing.to_json %>
prepared_statements: <%= @db_prepared_statements %>
statements_limit: <%= @db_statements_limit %>