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

2018-08-19 09:27:18 +02:00
parent 44e31c3e53 59c68c1a74
commit 88a0395a58
22 changed files with 108 additions and 28 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -324,6 +324,8 @@ GEM
      nokogiri (>= 1.5.9)
    mail (2.7.0)
      mini_mime (>= 0.1.1)
+    makara (0.4.0)
+      activerecord (>= 3.0.0)
    marcel (0.3.2)
      mimemagic (~> 0.3.2)
    mario-redis-lock (1.2.1)
@ -700,6 +702,7 @@ DEPENDENCIES
  letter_opener_web (~> 1.3)
  link_header (~> 0.0)
  lograge (~> 0.10)
+  makara (~> 0.4)
  mario-redis-lock (~> 1.2)
  memory_profiler
  microformats (~> 4.0)