Merge 574a1f9 into 2030315

Gemfile.lock

@@ -51,8 +51,9 @@ GEM
       thor (>= 0.14.0)
     arel (7.1.4)
     ast (2.4.0)
-    backport (0.3.0)
+    backport (1.1.2)
     bcrypt (3.1.13)
+    benchmark (0.1.0)
     bson (4.5.0)
     builder (3.2.3)
     byebug (11.0.1)
@@ -74,6 +75,7 @@ GEM
       warden (~> 1.2.3)
     diff-lcs (1.3)
     docile (1.3.2)
+    e2mmap (0.1.0)
     easy_captcha (0.6.5)
       bundler (>= 1.1.0)
       rails (>= 3.0.0)
@@ -85,13 +87,11 @@ GEM
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     hashie (3.6.0)
-    htmlentities (4.3.4)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     interception (0.5)
-    jaro_winkler (1.5.3)
+    jaro_winkler (1.5.4)
     json (2.2.0)
-    kramdown (1.17.0)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -100,6 +100,7 @@ GEM
       rake (>= 0.9.2.2)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    maruku (0.7.3)
     method_source (0.9.2)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
@@ -110,14 +111,14 @@ GEM
       activemodel (~> 5.0)
       mongo (>= 2.4.1, < 3.0.0)
     nio4r (2.4.0)
-    nokogiri (1.10.4)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     omniauth (1.9.0)
       hashie (>= 3.4.6, < 3.7.0)
       rack (>= 1.6.2, < 3)
     orm_adapter (0.5.0)
-    parallel (1.17.0)
-    parser (2.6.4.1)
+    parallel (1.19.1)
+    parser (2.7.0.2)
       ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -161,7 +162,7 @@ GEM
     responders (3.0.0)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    reverse_markdown (1.3.0)
+    reverse_markdown (1.4.0)
       nokogiri
     rmagick (4.0.0)
     rspec-core (3.8.2)
@@ -197,15 +198,18 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    solargraph (0.31.3)
-      backport (~> 0.3)
-      htmlentities (~> 4.3, >= 4.3.4)
+    solargraph (0.38.2)
+      backport (~> 1.1)
+      benchmark
+      bundler (>= 1.17.2)
+      e2mmap
       jaro_winkler (~> 1.5)
-      kramdown (~> 1.16)
+      maruku (~> 0.7, >= 0.7.3)
+      nokogiri (~> 1.9, >= 1.9.1)
       parser (~> 2.3)
       reverse_markdown (~> 1.0, >= 1.0.5)
       rubocop (~> 0.52)
-      thor (~> 0.19, >= 0.19.4)
+      thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9)
     sprockets (3.7.2)
@@ -218,9 +222,9 @@ GEM
     sqlite3 (1.3.13)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tilt (2.0.9)
+    tilt (2.0.10)
     tins (1.21.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
@@ -231,7 +235,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
     wwtd (1.4.0)
-    yard (0.9.20)
+    yard (0.9.24)
 
 PLATFORMS
   ruby