diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-19 00:11:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-19 00:11:05 +0300 |
| commit | f7ae5366cc28c4fefdc2bb1b0dcfaa9650812db9 (patch) | |
| tree | 17a4138a685d4575685f9af953f0fa9fd5f89775 /config | |
| parent | 35144b7075d343a8b3676708da03986103ed5dd1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/merge_ref_auto_sync_lock.yml | 8 | ||||
| -rw-r--r-- | config/puma.example.development.rb | 5 | ||||
| -rw-r--r-- | config/puma.rb.example | 5 | ||||
| -rw-r--r-- | config/puma_actioncable.example.development.rb | 5 |
4 files changed, 15 insertions, 8 deletions
diff --git a/config/feature_flags/development/merge_ref_auto_sync_lock.yml b/config/feature_flags/development/merge_ref_auto_sync_lock.yml deleted file mode 100644 index 3aec2b4e062..00000000000 --- a/config/feature_flags/development/merge_ref_auto_sync_lock.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: merge_ref_auto_sync_lock -introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31082 -rollout_issue_url: -milestone: '12.2' -type: development -group: group::code review -default_enabled: true diff --git a/config/puma.example.development.rb b/config/puma.example.development.rb index 7e616ee4768..28c2af3acb3 100644 --- a/config/puma.example.development.rb +++ b/config/puma.example.development.rb @@ -84,6 +84,11 @@ if defined?(wait_for_less_busy_worker) wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f end +# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork +if defined?(nakayoshi_fork) + nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true' +end + # Use json formatter require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter" diff --git a/config/puma.rb.example b/config/puma.rb.example index 25e38626260..9fc354a8fe8 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -74,6 +74,11 @@ if defined?(wait_for_less_busy_worker) wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f end +# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork +if defined?(nakayoshi_fork) + nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true' +end + # Use json formatter require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter" diff --git a/config/puma_actioncable.example.development.rb b/config/puma_actioncable.example.development.rb index 106932606e0..d0da3dcd8f2 100644 --- a/config/puma_actioncable.example.development.rb +++ b/config/puma_actioncable.example.development.rb @@ -84,6 +84,11 @@ if defined?(wait_for_less_busy_worker) wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f end +# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork +if defined?(nakayoshi_fork) + nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true' +end + # Use json formatter require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter" |