Support Puma web server
There are merge conflicts
The comparison view may be inaccurate due to merge conflicts.
Resolve these conflicts or ask someone with write access to this repository to merge it locally.
Created by: denji
init script for BSD @denvazhsudo echo 'gitlab_enable="YES"' >> /etc/rc.conf
# gitlab_dir=/usr/home/services/git/gitlab
# gitlab_user=git
# gitlab_env=productiontask_helper
$ bundle install --without development test [mysql|postgres] unicorn \
--path vendor/bundle --no-deployment# Application server
group :unicorn do
gem "unicorn", '~> 4.6.3'
gem 'unicorn-worker-killer'
end
+
+group :puma do
+ gem 'puma'
+ gem 'puma_worker_killer'
+ #gem 'puma_auto_tune'
+endThe comparison view may be inaccurate due to merge conflicts.
Resolve these conflicts or ask someone with write access to this repository to merge it locally.