diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /config/gitlab.yml.example | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
| download | gitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index da1a15302da..aee9dd455af 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -438,6 +438,12 @@ production: &base ## Sidekiq sidekiq: log_format: json # (default is the original format) + # An array of tuples indicating the rules for re-routing a worker to a + # desirable queue before scheduling. For example: + # routing_rules: + # - ["resource_boundary=cpu", "cpu_boundary"] + # - ["feature_category=pages", null] + # - ["*", "default"] ## Auxiliary jobs # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc. @@ -1264,6 +1270,10 @@ production: &base # matomo_site_id: '_your_matomo_site_id' # matomo_disable_cookies: false + ## Maximum file size for syntax highlighting + ## https://docs.gitlab.com/ee/user/project/highlighting.html + # maximum_text_highlight_size_kilobytes: 512 + rack_attack: git_basic_auth: # Rack Attack IP banning enabled @@ -1416,7 +1426,7 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: - client_path: tmp/tests/gitaly + client_path: tmp/tests/gitaly/_build/bin token: secret workhorse: secret_file: tmp/gitlab_workhorse_test_secret |