kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix-bin-web-puma-script-to-consider-rails-env' into 'master'

Browse source 
Make `bin/web_puma` consider RAILS_ENV

See merge request gitlab-org/gitlab-ce!31378
This commit is contained in:
Kamil Trzciński 2019-08-02 09:03:39 +00:00
commit ebdd3a233e
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/web_puma
View file

@ -10,7 +10,7 @@ puma_config="$app_root/config/puma.rb"
spawn_puma()
{
exec bundle exec puma --config "${puma_config}" "$@"
exec bundle exec puma --config "${puma_config}" --environment "$RAILS_ENV" "$@"
}
get_puma_pid()

5
changelogs/unreleased/fix-bin-web-puma-script-to-consider-rails-env.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Make `bin/web_puma` consider RAILS_ENV
merge_request: 31378
author:
type: fixed