nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Jonne Haß 2021-04-17 11:56:04 +02:00
commit e8442021b6
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -10,8 +10,8 @@ gem "responders", "3.0.1"
# Appserver # Appserver
gem "unicorn", "5.5.3", require: false gem "unicorn", "6.0.0", require: false
gem "unicorn-worker-killer", "0.4.4" gem "unicorn-worker-killer", "0.4.5"
# Federation # Federation

10
Gemfile.lock
View file

@ -746,12 +746,12 @@ GEM
unf_ext unf_ext
unf_ext (0.0.7.7) unf_ext (0.0.7.7)
unicode-display_width (1.7.0) unicode-display_width (1.7.0)
unicorn (5.5.3) unicorn (6.0.0)
kgio (~> 2.6) kgio (~> 2.6)
raindrops (~> 0.7) raindrops (~> 0.7)
unicorn-worker-killer (0.4.4) unicorn-worker-killer (0.4.5)
get_process_mem (~> 0) get_process_mem (~> 0)
unicorn (>= 4, < 6) unicorn (>= 4, < 7)
uuid (2.3.9) uuid (2.3.9)
macaddr (~> 1.0) macaddr (~> 1.0)
valid (1.2.0) valid (1.2.0)
@ -918,8 +918,8 @@ DEPENDENCIES
twitter-text (= 3.1.0) twitter-text (= 3.1.0)
typhoeus (= 1.4.0) typhoeus (= 1.4.0)
uglifier (= 4.2.0) uglifier (= 4.2.0)
unicorn (= 5.5.3) unicorn (= 6.0.0)
unicorn-worker-killer (= 0.4.4) unicorn-worker-killer (= 0.4.5)
uuid (= 2.3.9) uuid (= 2.3.9)
versionist (= 2.0.1) versionist (= 2.0.1)
webmock (= 3.12.2) webmock (= 3.12.2)