summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksei Lipniagov <alipniagov@gitlab.com>2019-08-01 15:28:45 +0300
committerAleksei Lipniagov <alipniagov@gitlab.com>2019-08-01 17:47:52 +0300
commite2e878bdd8aa8d93b026234e4b6c873a891d0259 (patch)
tree634351b09f582e71fb272f69d845a36b892a250c
parentc36b12d7f12ed830662a8169cef3e880bd788f3b (diff)
downloadgitlab-ce-e2e878bdd8aa8d93b026234e4b6c873a891d0259.tar.gz
Make `bin/web_puma` consider RAILS_ENVfix-bin-web-puma-script-to-consider-rails-env
-rwxr-xr-xbin/web_puma2
-rw-r--r--changelogs/unreleased/fix-bin-web-puma-script-to-consider-rails-env.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/bin/web_puma b/bin/web_puma
index 178fe84800d..29d72cd4a41 100755
--- a/bin/web_puma
+++ b/bin/web_puma
@@ -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()
diff --git a/changelogs/unreleased/fix-bin-web-puma-script-to-consider-rails-env.yml b/changelogs/unreleased/fix-bin-web-puma-script-to-consider-rails-env.yml
new file mode 100644
index 00000000000..a0564369b02
--- /dev/null
+++ b/changelogs/unreleased/fix-bin-web-puma-script-to-consider-rails-env.yml
@@ -0,0 +1,5 @@
+---
+title: Make `bin/web_puma` consider RAILS_ENV
+merge_request: 31378
+author:
+type: fixed