update bundles

tdiary · Jan 19, 2017 · f8c0330 · f8c0330
1 parent 4ec0ab9
commit f8c0330
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 30 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -14,24 +14,24 @@ GEM
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.1)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.4)
     coveralls (0.7.12)
       multi_json (~> 1.10)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.9.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     domain_name (0.5.20161129)
       unf (>= 0.0.5, < 1.0.0)
     emot (0.0.4)
       thor
-    faraday (0.10.0)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
     fastimage (2.0.1)
       addressable (~> 2)
-    ffi (1.9.14)
+    ffi (1.9.17)
     hikidoc (0.1.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
@@ -51,7 +51,7 @@ GEM
     multi_json (1.12.1)
     multipart-post (2.0.0)
     netrc (0.11.0)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
     octokit (4.6.2)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -65,15 +65,15 @@ GEM
     pry-byebug (3.4.2)
       byebug (~> 9.0)
       pry (~> 0.10)
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     rack (1.6.5)
     rack-test (0.6.3)
       rack (>= 1.0)
     racksh (1.0.0)
       rack (>= 1.0)
       rack-test (>= 0.5)
     rake (12.0.0)
-    redcarpet (3.3.4)
+    redcarpet (3.4.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -95,21 +95,21 @@ GEM
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    selenium-webdriver (3.0.3)
+    selenium-webdriver (3.0.5)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sequel (4.41.0)
+    sequel (4.42.1)
     simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
       simplecov-html (~> 0.9.0)
     simplecov-html (0.9.0)
     slop (3.6.0)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sqlite3 (1.3.12)
+    sqlite3 (1.3.13)
     term-ansicolor (1.4.0)
       tins (~> 1.0)
     test-unit (3.2.3)
@@ -151,4 +151,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.13.6
+   1.13.7
diff --git a/misc/paas/heroku/Gemfile.local b/misc/paas/heroku/Gemfile.local
@@ -1,4 +1,4 @@
-ruby '~> 2.3.0'
+ruby '~> 2.4.0'
 gem 'puma', require: false
 gem 'tdiary-io-mongodb', git: 'https://github.com/tdiary/tdiary-io-mongodb.git'
 gem 'tdiary-contrib', git: 'https://github.com/tdiary/tdiary-contrib.git'
@@ -9,6 +9,3 @@ gem 'omniauth-twitter'
 gem 'dalli'
 gem 'memcachier'
 gem 'octokit'
-
-# avoid error on gfm-style
-gem 'twitter-text', '= 1.14.2'
diff --git a/misc/paas/heroku/Gemfile.lock b/misc/paas/heroku/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/tdiary/tdiary-contrib.git
-  revision: fac7137979de778d76a074eace7a5b26175d592b
+  revision: 4f5c6f5f31902102451646e62ef19d53fc7c96e4
   specs:
     tdiary-contrib (5.0.3)
       ruby-pushbullet
@@ -46,17 +46,17 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
     dalli (2.7.6)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     domain_name (0.5.20161129)
       unf (>= 0.0.5, < 1.0.0)
     emot (0.0.4)
       thor
-    faraday (0.10.1)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
     fastimage (2.0.1)
       addressable (~> 2)
-    ffi (1.9.14)
+    ffi (1.9.17)
     github-markdown (0.6.9)
     hashie (3.4.6)
     hikidoc (0.1.0)
@@ -69,7 +69,7 @@ GEM
       rack (>= 1.2.1)
       rake
     jasmine-core (2.5.2)
-    json (1.8.3)
+    json (2.0.3)
     launchy (2.4.3)
       addressable (~> 2.3)
     mail (2.6.4)
@@ -92,15 +92,15 @@ GEM
     oauth (0.5.1)
     octokit (4.6.2)
       sawyer (~> 0.8.0, >= 0.5.3)
-    omniauth (1.3.1)
+    omniauth (1.3.2)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
     omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
-    omniauth-twitter (1.2.1)
-      json (~> 1.3)
+    omniauth-twitter (1.3.0)
       omniauth-oauth (~> 1.1)
+      rack
     phantomjs (2.1.1.0)
     pit (0.0.7)
     power_assert (0.4.1)
@@ -151,7 +151,7 @@ GEM
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sequel (4.42.0)
+    sequel (4.42.1)
     simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
@@ -161,7 +161,7 @@ GEM
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sqlite3 (1.3.12)
+    sqlite3 (1.3.13)
     tdiary (5.0.3)
       bundler (~> 1.3)
       emot
@@ -186,7 +186,7 @@ GEM
     thor (0.19.4)
     thread_safe (0.3.5)
     tins (1.13.0)
-    twitter-text (1.14.2)
+    twitter-text (1.14.5)
       unf (~> 0.1.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -232,10 +232,9 @@ DEPENDENCIES
   tdiary-style-gfm
   tdiary-style-rd
   test-unit
-  twitter-text (= 1.14.2)
 
 RUBY VERSION
-   ruby 2.3.3p222
+   ruby 2.4.0p0
 
 BUNDLED WITH
-   1.13.6
+   1.13.7