Merge 8384b33 into 085451c

tdiary · Nov 29, 2019 · ecf1402 · ecf1402
2 parents 085451c + 8384b33
commit ecf1402
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 38 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -14,20 +14,20 @@ GEM
       xpath (~> 3.2)
     childprocess (3.0.0)
     coderay (1.1.2)
-    coveralls (0.7.2)
-      multi_json (~> 1.3)
-      rest-client (= 1.6.7)
-      simplecov (>= 0.7)
-      term-ansicolor (= 1.2.2)
-      thor (= 0.18.1)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
     debase (0.2.4.1)
       debase-ruby_core_source (>= 0.10.2)
-    debase-ruby_core_source (0.10.6)
+    debase-ruby_core_source (0.10.7)
     diff-lcs (1.3)
     docile (1.3.2)
     emot (0.0.4)
       thor
-    faraday (0.17.0)
+    faraday (0.17.1)
       multipart-post (>= 1.2, < 3)
     fastimage (2.1.7)
     hikidoc (0.1.0)
@@ -48,7 +48,6 @@ GEM
     mime-types-data (3.2019.1009)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    multi_json (1.14.1)
     multipart-post (2.1.1)
     nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
@@ -73,8 +72,6 @@ GEM
     rake (13.0.1)
     redcarpet (3.5.0)
     regexp_parser (1.6.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -98,18 +95,18 @@ GEM
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
     sequel (5.26.0)
-    simplecov (0.17.1)
+    simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     sqlite3 (1.4.1)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
     test-unit (3.3.4)
       power_assert
-    thor (0.18.1)
-    tins (0.13.2)
+    thor (0.20.3)
+    tins (1.22.2)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 

diff --git a/misc/paas/heroku/Gemfile.lock b/misc/paas/heroku/Gemfile.lock
@@ -19,14 +19,14 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
-    activesupport (6.0.0)
+    activemodel (6.0.1)
+      activesupport (= 6.0.1)
+    activesupport (6.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
+      zeitwerk (~> 2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     bson (4.6.0)
@@ -44,21 +44,21 @@ GEM
     commonmarker (0.20.1)
       ruby-enum (~> 0.5)
     concurrent-ruby (1.1.5)
-    coveralls (0.7.2)
-      multi_json (~> 1.3)
-      rest-client (= 1.6.7)
-      simplecov (>= 0.7)
-      term-ansicolor (= 1.2.2)
-      thor (= 0.18.1)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
     dalli (2.7.10)
     debase (0.2.4.1)
       debase-ruby_core_source (>= 0.10.2)
-    debase-ruby_core_source (0.10.6)
+    debase-ruby_core_source (0.10.7)
     diff-lcs (1.3)
     docile (1.3.2)
     emot (0.0.4)
       thor
-    faraday (0.17.0)
+    faraday (0.17.1)
       multipart-post (>= 1.2, < 3)
     fastimage (2.1.7)
     hashie (3.6.0)
@@ -90,7 +90,6 @@ GEM
     mongoid (7.0.5)
       activemodel (>= 5.1, < 6.1)
       mongo (>= 2.5.1, < 3.0.0)
-    multi_json (1.14.1)
     multipart-post (2.1.1)
     nio4r (2.5.2)
     nokogiri (1.10.5)
@@ -117,7 +116,7 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (4.0.1)
-    puma (4.2.1)
+    puma (4.3.0)
       nio4r (~> 2.0)
     pushbullet_ruby (1.1.4)
       faraday (>= 0.13.0, < 1.0)
@@ -128,12 +127,10 @@ GEM
     racksh (1.0.0)
       rack (>= 1.0)
       rack-test (>= 0.5)
-    rake (13.0.0)
+    rake (13.0.1)
     rdtool (0.6.38)
     redcarpet (3.5.0)
     regexp_parser (1.6.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -159,7 +156,7 @@ GEM
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
     sequel (5.26.0)
-    simplecov (0.17.1)
+    simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
@@ -180,13 +177,13 @@ GEM
       twitter-text (>= 2.0)
     tdiary-style-rd (0.0.3)
       rdtool
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
     test-unit (3.3.4)
       power_assert
-    thor (0.18.1)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tins (0.13.2)
+    tins (1.22.2)
     twitter-text (3.0.0)
       idn-ruby
       unf (~> 0.1.0)