diff options
| author | Jonne Haß <me@jhass.eu> | 2021-04-17 12:56:04 +0300 |
|---|---|---|
| committer | Jonne Haß <me@jhass.eu> | 2021-04-17 12:56:04 +0300 |
| commit | e8442021b699b0f9512624aa22c9cd0331334aa8 (patch) | |
| tree | 0b211c3260531dce8c5fdcc2762f2abf3ce8a092 | |
| parent | 69c6305e62d8c1febf6e9535fffd42bd4f5727d5 (diff) | |
| parent | 33b7d3253a09ea5e73d1f69b09d3ff316f90b9dd (diff) | |
Merge branch 'next-minor' into develop
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 10 |
2 files changed, 7 insertions, 7 deletions
@@ -10,8 +10,8 @@ gem "responders", "3.0.1" # Appserver -gem "unicorn", "5.5.3", require: false -gem "unicorn-worker-killer", "0.4.4" +gem "unicorn", "6.0.0", require: false +gem "unicorn-worker-killer", "0.4.5" # Federation diff --git a/Gemfile.lock b/Gemfile.lock index ef0b2c3d8..2daf7ebb7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -746,12 +746,12 @@ GEM unf_ext unf_ext (0.0.7.7) unicode-display_width (1.7.0) - unicorn (5.5.3) + unicorn (6.0.0) kgio (~> 2.6) raindrops (~> 0.7) - unicorn-worker-killer (0.4.4) + unicorn-worker-killer (0.4.5) get_process_mem (~> 0) - unicorn (>= 4, < 6) + unicorn (>= 4, < 7) uuid (2.3.9) macaddr (~> 1.0) valid (1.2.0) @@ -918,8 +918,8 @@ DEPENDENCIES twitter-text (= 3.1.0) typhoeus (= 1.4.0) uglifier (= 4.2.0) - unicorn (= 5.5.3) - unicorn-worker-killer (= 0.4.4) + unicorn (= 6.0.0) + unicorn-worker-killer (= 0.4.5) uuid (= 2.3.9) versionist (= 2.0.1) webmock (= 3.12.2) |