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/environments/development.rb | |
| 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/environments/development.rb')
| -rw-r--r-- | config/environments/development.rb | 2 |
1 files changed, 2 insertions, 0 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 |