diff options
| author | DJ Mountney <david@twkie.net> | 2018-10-29 14:37:19 -0700 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2018-10-29 14:37:19 -0700 |
| commit | 06b6daacb15b92b04e05538b37aadfdb04fc5a4b (patch) | |
| tree | 0500cf47f7d8d2e6bc7ed53cbf9ad957f07fb31a /bin/web | |
| parent | c847f172d25efc211045c363f4e55402ad250c09 (diff) | |
| parent | 45b61a9ece48550f51432c8cca7de7e1a298ca08 (diff) | |
| download | gitlab-ce-06b6daacb15b92b04e05538b37aadfdb04fc5a4b.tar.gz | |
Merge remote-tracking branch 'origin/master' into dev-master
Diffstat (limited to 'bin/web')
| -rwxr-xr-x | bin/web | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -3,6 +3,11 @@ cd $(dirname $0)/.. app_root=$(pwd) +# Switch to experimental PUMA configuration +if [ -n "${EXPERIMENTAL_PUMA}" ]; then + exec bin/web_puma "$@" +fi + unicorn_pidfile="$app_root/tmp/pids/unicorn.pid" unicorn_config="$app_root/config/unicorn.rb" unicorn_cmd="bundle exec unicorn_rails -c $unicorn_config -E $RAILS_ENV" |