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-11 17:42:40 +02:00
commit 4f9257985c
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Gemfile.lock
View file

@ -93,10 +93,11 @@ GEM
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0) regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2) xpath (~> 3.2)
carrierwave (1.3.1) carrierwave (1.3.2)
activemodel (>= 4.0.0) activemodel (>= 4.0.0)
activesupport (>= 4.0.0) activesupport (>= 4.0.0)
mime-types (>= 1.16) mime-types (>= 1.16)
ssrf_filter (~> 1.0)
celluloid (0.17.4) celluloid (0.17.4)
celluloid-essentials celluloid-essentials
celluloid-extras celluloid-extras
@ -696,6 +697,7 @@ GEM
actionpack (>= 4.0) actionpack (>= 4.0)
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
ssrf_filter (1.0.7)
state_machines (0.5.0) state_machines (0.5.0)
string-direction (1.2.2) string-direction (1.2.2)
swd (1.2.0) swd (1.2.0)
@ -793,7 +795,7 @@ DEPENDENCIES
bootstrap-sass (= 3.4.1) bootstrap-sass (= 3.4.1)
bootstrap-switch-rails (= 3.3.5) bootstrap-switch-rails (= 3.3.5)
capybara (= 3.35.3) capybara (= 3.35.3)
carrierwave (= 1.3.1) carrierwave (= 1.3.2)
chrome_remote (= 0.3.0) chrome_remote (= 0.3.0)
compass-rails (= 3.1.0) compass-rails (= 3.1.0)
configurate (= 0.5.0) configurate (= 0.5.0)