Skip to content
This repository has been archived by the owner on Nov 17, 2020. It is now read-only.

Commit

Permalink
Merge #109
Browse files Browse the repository at this point in the history
109: Bump puma from 4.1.0 to 4.1.1 r=michaelbaudino a=dependabot-preview[bot]

Bumps [puma](https://github.com/puma/puma) from 4.1.0 to 4.1.1.
<details>
<summary>Release notes</summary>

*Sourced from [puma's releases](https://github.com/puma/puma/releases).*

> ## 4.1.1
> 3 bugfixes
> 
> * Revert our attempt to not dup STDOUT/STDERR ([#1946](https://github-redirect.dependabot.com/puma/puma/issues/1946))
> * Fix socket close on error ([#1941](https://github-redirect.dependabot.com/puma/puma/issues/1941))
> * Fix workers not shutting down correctly ([#1908](https://github-redirect.dependabot.com/puma/puma/issues/1908))
</details>
<details>
<summary>Changelog</summary>

*Sourced from [puma's changelog](https://github.com/puma/puma/blob/master/History.md).*

> ## 4.1.1 / 2019-09-05
> 
> * 3 bugfixes
>   * Revert our attempt to not dup STDOUT/STDERR ([#1946](https://github-redirect.dependabot.com/puma/puma/issues/1946))
>   * Fix socket close on error ([#1941](https://github-redirect.dependabot.com/puma/puma/issues/1941))
>   * Fix workers not shutting down correctly ([#1908](https://github-redirect.dependabot.com/puma/puma/issues/1908))
</details>
<details>
<summary>Commits</summary>

- [`e324a12`](puma/puma@e324a12) Version to 4.1.1
- [`ce45845`](puma/puma@ce45845) test_integration.erb - fix intermittent test ([#1924](https://github-redirect.dependabot.com/puma/puma/issues/1924))
- [`9efac9e`](puma/puma@9efac9e) tests - clean up - three commits ([#1903](https://github-redirect.dependabot.com/puma/puma/issues/1903))
- [`b4ff8e1`](puma/puma@b4ff8e1) 4.1.1 release notes
- [`677f6b8`](puma/puma@677f6b8) Revert "Avoid mutating global STDOUT & STDERR ([#1837](https://github-redirect.dependabot.com/puma/puma/issues/1837))" ([#1946](https://github-redirect.dependabot.com/puma/puma/issues/1946))
- [`2fb0f27`](puma/puma@2fb0f27) lib\puma\accept_nonblock.rb - fix socket closing on error ([#1941](https://github-redirect.dependabot.com/puma/puma/issues/1941))
- [`5e96236`](puma/puma@5e96236) Fixes Cluster worker shutdown/restart ([#1908](https://github-redirect.dependabot.com/puma/puma/issues/1908))
- See full diff in [compare view](puma/puma@v4.1.0...v4.1.1)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=puma&package-manager=bundler&previous-version=4.1.0&new-version=4.1.1)](https://dependabot.com/compatibility-score.html?dependency-name=puma&package-manager=bundler&previous-version=4.1.0&new-version=4.1.1)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
If all status checks pass Dependabot will automatically merge this pull request.

[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
  • Loading branch information
2 parents 7943c41 + 28fa1eb commit bbf1777
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ GEM
mini_portile2 (2.4.0)
minitest (5.11.3)
msgpack (1.2.10)
nio4r (2.4.0)
nio4r (2.5.1)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
parallel (1.17.0)
Expand All @@ -96,7 +96,7 @@ GEM
pry-rails (0.3.9)
pry (>= 0.10.4)
psych (3.1.0)
puma (4.1.0)
puma (4.1.1)
nio4r (~> 2.0)
rack (2.0.7)
rack-proxy (0.6.5)
Expand Down

0 comments on commit bbf1777

Please sign in to comment.