diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-20 03:10:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-20 03:10:55 +0300 |
| commit | cf0dbcbf109a51edad3533b51f2bc76163e7305a (patch) | |
| tree | 2f48a49c42fb4cef1eb6ca2f3c24ea2cc67ff14e /bin | |
| parent | 83d7a3922367d95a0875f9bdbdbf34a37f84e3fb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/actioncable | 2 | ||||
| -rwxr-xr-x | bin/web_puma | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/actioncable b/bin/actioncable index 0aacb19e070..14600ec1177 100755 --- a/bin/actioncable +++ b/bin/actioncable @@ -36,7 +36,7 @@ start_foreground() stop() { get_puma_pid - kill -QUIT "$(get_puma_pid)" + kill -INT "$(get_puma_pid)" } reload() diff --git a/bin/web_puma b/bin/web_puma index 6a9b729f6dd..c1ab4718f0d 100755 --- a/bin/web_puma +++ b/bin/web_puma @@ -36,7 +36,7 @@ start_foreground() stop() { get_puma_pid - kill -QUIT "$(get_puma_pid)" + kill -INT "$(get_puma_pid)" } reload() |