diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-02 09:03:39 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-02 09:03:39 +0000 |
| commit | ebdd3a233e1e5dd252eef6c4ba5f1da311fe68e2 (patch) | |
| tree | 702a5d292a8040b7e0d923a5e0e7ebe2e6584314 | |
| parent | 407de0417d8ecb625e457054a85497f0e640316f (diff) | |
| parent | e2e878bdd8aa8d93b026234e4b6c873a891d0259 (diff) | |
| download | gitlab-ce-ebdd3a233e1e5dd252eef6c4ba5f1da311fe68e2.tar.gz | |
Merge branch 'fix-bin-web-puma-script-to-consider-rails-env' into 'master'
Make `bin/web_puma` consider RAILS_ENV
See merge request gitlab-org/gitlab-ce!31378
| -rwxr-xr-x | bin/web_puma | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-bin-web-puma-script-to-consider-rails-env.yml | 5 |
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 |