tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2020-08-19 19:16:41 +02:00
parent 5dcc406abe f6a82cb2cd
commit 74a9affdcc
8 changed files with 109 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Gemfile.lock
View File

@ -6,14 +6,6 @@ GIT
health_check (4.0.0.pre)
rails (>= 4.0)
GIT
remote: https://github.com/tmm1/http_parser.rb
revision: 54b17ba8c7d8d20a16dfc65d1775241833219cf2
ref: 54b17ba8c7d8d20a16dfc65d1775241833219cf2
submodules: true
specs:
http_parser.rb (0.6.1)
GIT
remote: https://github.com/witgo/nilsimsa
revision: fd184883048b922b176939f851338d0a4971a532
@ -85,7 +77,7 @@ GEM
av (0.9.0)
cocaine (~> 0.5.3)
aws-eventstream (1.1.0)
aws-partitions (1.349.0)
aws-partitions (1.356.0)
aws-sdk-core (3.104.3)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@ -94,7 +86,7 @@ GEM
aws-sdk-kms (1.36.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.75.0)
aws-sdk-s3 (1.76.0)
aws-sdk-core (~> 3, >= 3.104.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@ -111,7 +103,7 @@ GEM
ffi (~> 1.10.0)
bootsnap (1.4.7)
msgpack (~> 1.0)
brakeman (4.8.2)
brakeman (4.9.0)
browser (4.2.0)
builder (3.2.4)
bullet (6.1.0)
@ -151,7 +143,7 @@ GEM
activesupport (>= 4.0)
elasticsearch (>= 2.0.0)
elasticsearch-dsl
chunky_png (1.3.11)
chunky_png (1.3.12)
cld3 (3.3.0)
ffi (>= 1.1.0, < 1.12.0)
climate_control (0.2.0)
@ -159,7 +151,7 @@ GEM
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.3)
color_diff (0.1)
concurrent-ruby (1.1.6)
concurrent-ruby (1.1.7)
connection_pool (2.2.3)
crack (0.4.3)
safe_yaml (~> 1.0.0)
@ -234,7 +226,7 @@ GEM
fog-json (>= 1.0)
ipaddress (>= 0.8)
formatador (0.2.5)
fugit (1.3.6)
fugit (1.3.8)
et-orbi (~> 1.1, >= 1.1.8)
raabro (~> 1.3)
fuubar (2.5.0)
@ -407,9 +399,9 @@ GEM
pg (1.2.3)
pghero (2.7.0)
activerecord (>= 5)
pkg-config (1.4.1)
pkg-config (1.4.2)
posix-spawn (0.3.15)
premailer (1.12.1)
premailer (1.13.1)
addressable
css_parser (>= 1.6.0)
htmlentities (>= 4.0.0)
@ -475,7 +467,7 @@ GEM
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (13.0.1)
rdf (3.1.4)
rdf (3.1.5)
hamster (~> 3.0)
link_header (~> 0.0, >= 0.0.8)
rdf-normalize (0.4.0)
@ -614,7 +606,7 @@ GEM
thwait (0.2.0)
e2mmap
tilt (2.0.10)
tty-color (0.5.1)
tty-color (0.5.2)
tty-cursor (0.7.1)
tty-prompt (0.22.0)
pastel (~> 0.8)
@ -664,12 +656,12 @@ DEPENDENCIES
active_record_query_trace (~> 1.7)
addressable (~> 2.7)
annotate (~> 3.1)
aws-sdk-s3 (~> 1.75)
aws-sdk-s3 (~> 1.76)
better_errors (~> 2.7)
binding_of_caller (~> 0.7)
blurhash (~> 0.1)
bootsnap (~> 1.4)
brakeman (~> 4.8)
brakeman (~> 4.9)
browser
bullet (~> 6.1)
bundler-audit (~> 0.7)
@ -707,7 +699,6 @@ DEPENDENCIES
htmlentities (~> 4.3)
http (~> 4.4)
http_accept_language (~> 2.1)
http_parser.rb (~> 0.6)!
httplog (~> 1.4.3)
i18n-tasks (~> 0.9)
idn-ruby