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
2018-10-08 13:51:33 +02:00
parent 96c3d26870 4c4ff05a46
commit d17844e6d1
58 changed files with 875 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Gemfile.lock
View File

@ -77,7 +77,7 @@ GEM
cocaine (~> 0.5.3)
aws-eventstream (1.0.1)
aws-partitions (1.105.0)
aws-sdk-core (3.29.0)
aws-sdk-core (3.30.0)
aws-eventstream (~> 1.0)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.0)
@ -85,7 +85,7 @@ GEM
aws-sdk-kms (1.9.0)
aws-sdk-core (~> 3, >= 3.26.0)
aws-sigv4 (~> 1.0)
aws-sdk-s3 (1.20.0)
aws-sdk-s3 (1.21.0)
aws-sdk-core (~> 3, >= 3.26.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0)
@ -126,7 +126,7 @@ GEM
sshkit (~> 1.3)
capistrano-yarn (2.0.2)
capistrano (~> 3.0)
capybara (3.8.2)
capybara (3.9.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
@ -188,9 +188,6 @@ GEM
dotenv-rails (2.2.2)
dotenv (= 2.2.2)
railties (>= 3.2, < 6.0)
easy_translate (0.5.1)
thread
thread_safe
elasticsearch (6.0.2)
elasticsearch-api (= 6.0.2)
elasticsearch-transport (= 6.0.2)
@ -255,7 +252,7 @@ GEM
hashdiff (0.3.7)
hashie (3.5.7)
heapy (0.1.4)
highline (1.7.10)
highline (2.0.0)
hiredis (0.6.1)
hitimes (1.3.0)
hkdf (0.3.0)
@ -276,12 +273,11 @@ GEM
rainbow (>= 2.0.0)
i18n (1.1.0)
concurrent-ruby (~> 1.0)
i18n-tasks (0.9.21)
i18n-tasks (0.9.25)
activesupport (>= 4.0.2)
ast (>= 2.1.0)
easy_translate (>= 0.5.1)
erubi
highline (>= 1.7.3)
highline (>= 2.0.0)
i18n
parser (>= 2.2.3.0)
rainbow (>= 2.2.2, < 4.0)
@ -599,7 +595,6 @@ GEM
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
thor (0.20.0)
thread (0.2.2)
thread_safe (0.3.6)
tilt (2.0.8)
timers (4.1.2)
@ -608,7 +603,7 @@ GEM
tty-command (0.8.2)
pastel (~> 0.7.0)
tty-cursor (0.6.0)
tty-prompt (0.17.0)
tty-prompt (0.17.1)
necromancer (~> 0.4.0)
pastel (~> 0.7.0)
timers (~> 4.0)
@ -658,7 +653,7 @@ DEPENDENCIES
active_record_query_trace (~> 1.5)
addressable (~> 2.5)
annotate (~> 2.7)
aws-sdk-s3 (~> 1.20)
aws-sdk-s3 (~> 1.21)
better_errors (~> 2.4)
binding_of_caller (~> 0.7)
bootsnap (~> 1.3)
@ -670,7 +665,7 @@ DEPENDENCIES
capistrano-rails (~> 1.3)
capistrano-rbenv (~> 2.1)
capistrano-yarn (~> 2.0)
capybara (~> 3.8)
capybara (~> 3.9)
charlock_holmes (~> 0.7.6)
chewy (~> 5.0)
cld3 (~> 3.2.0)