diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-11-07 05:21:25 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-11-07 05:21:25 +0000 |
| commit | 839a654ef0da5f13729074e24231344fe64a2cdc (patch) | |
| tree | 6dff019a9ea6164af7c9721ca2cb2ba30b886002 /config | |
| parent | 0a4eeafb43236359c55e221bdc8cab52acef9a0f (diff) | |
| parent | cf8fe12b7b3a24082db47f71c80b01e62e391f32 (diff) | |
| download | gitlab-ce-gl-ui-loading-icon.tar.gz | |
Merge branch 'master' into 'gl-ui-loading-icon'gl-ui-loading-icon
# Conflicts:
# app/assets/javascripts/jobs/components/job_app.vue
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/development.rb | 2 | ||||
| -rw-r--r-- | config/environments/production.rb | 2 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 1 |
4 files changed, 8 insertions, 1 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 23790b84e3c..494ddd72556 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -45,4 +45,6 @@ Rails.application.configure do # Do not log asset requests config.assets.quiet = true + + config.allow_concurrency = defined?(::Puma) end diff --git a/config/environments/production.rb b/config/environments/production.rb index 9941987929c..71195164e7a 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -83,5 +83,5 @@ Rails.application.configure do config.eager_load = true - config.allow_concurrency = false + config.allow_concurrency = defined?(::Puma) end diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index d37775e772d..09e21b2c6f2 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -207,6 +207,10 @@ production: &base # endpoint: 'http://127.0.0.1:9000' # default: nil # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' + ## Packages (maven repository so far) + packages: + enabled: false + ## GitLab Pages pages: enabled: false diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 0e723cdeb9c..53e1c8778b6 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -29,6 +29,7 @@ - [pipeline_creation, 4] - [pipeline_default, 3] - [pipeline_cache, 3] + - [deployment, 3] - [pipeline_hooks, 2] - [gitlab_shell, 2] - [email_receiver, 2] |