From a0391336396560900c457bc99f57b57364809850 Mon Sep 17 00:00:00 2001 From: "Tada, Tadashi" Date: Sun, 29 Nov 2020 21:59:38 +0900 Subject: [PATCH] release 5.1.4 * bundle update * remove mongolab from app.json Signed-off-by: Tada, Tadashi --- ChangeLog | 3 ++ Gemfile.lock | 16 ++++---- app.json | 5 +-- lib/tdiary/version.rb | 2 +- misc/paas/heroku/Gemfile.lock | 74 +++++++++++++++++------------------ 5 files changed, 52 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index a46b867cd..73924f1bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2020-11-29 Tada, Tadashi + * release 5.1.4 + 2020-08-29 Tada, Tadashi * release 5.1.3 * category.js: add support for multiple category display diff --git a/Gemfile.lock b/Gemfile.lock index f13e8fbec..c38f27f2b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - capybara (3.33.0) + capybara (3.34.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -20,13 +20,14 @@ GEM tins (~> 1.6) debase (0.2.4.1) debase-ruby_core_source (>= 0.10.2) - debase-ruby_core_source (0.10.10) + debase-ruby_core_source (0.10.11) diff-lcs (1.4.4) docile (1.3.2) emot (0.0.4) thor - faraday (0.17.3) + faraday (1.1.0) multipart-post (>= 1.2, < 3) + ruby2_keywords fastimage (2.2.0) hikidoc (0.1.0) jasmine (2.99.0) @@ -42,7 +43,7 @@ GEM mini_mime (>= 0.1.1) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2020.1104) mini_mime (1.0.2) mini_portile2 (2.4.0) multipart-post (2.1.1) @@ -54,7 +55,7 @@ GEM phantomjs (2.1.1.0) pit (0.0.7) power_assert (1.2.0) - public_suffix (3.1.1) + public_suffix (4.0.6) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -63,7 +64,7 @@ GEM rack-test (>= 0.5) rake (13.0.1) redcarpet (3.5.0) - regexp_parser (1.7.1) + regexp_parser (1.8.2) rspec (3.10.0) rspec-core (~> 3.10.0) rspec-expectations (~> 3.10.0) @@ -79,6 +80,7 @@ GEM rspec-support (3.10.0) ruby-debug-ide (0.7.2) rake (>= 0.8.1) + ruby2_keywords (0.0.2) rubyzip (2.3.0) sawyer (0.8.2) addressable (>= 2.3.5) @@ -99,7 +101,7 @@ GEM test-unit (3.3.7) power_assert thor (1.0.1) - tins (1.25.0) + tins (1.26.0) sync xpath (3.2.0) nokogiri (~> 1.8) diff --git a/app.json b/app.json index e28d34b58..fc65df474 100644 --- a/app.json +++ b/app.json @@ -1,11 +1,10 @@ { "name": "tDiary", - "website": "http://www.tdiary.org/", + "website": "https://tdiary.org/", "repository": "https://github.com/tdiary/tdiary-core", "addons": [ "sendgrid", - "memcachier", - "mongolab" + "memcachier" ], "scripts": { "postdeploy": "bundle exec rake mongodb:index" diff --git a/lib/tdiary/version.rb b/lib/tdiary/version.rb index c00a72a1a..9362cf321 100644 --- a/lib/tdiary/version.rb +++ b/lib/tdiary/version.rb @@ -1,3 +1,3 @@ module TDiary - VERSION = '5.1.3' + VERSION = '5.1.4' end diff --git a/misc/paas/heroku/Gemfile.lock b/misc/paas/heroku/Gemfile.lock index da8af5d18..335150ef1 100644 --- a/misc/paas/heroku/Gemfile.lock +++ b/misc/paas/heroku/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://github.com/tdiary/tdiary-contrib.git - revision: 598fffd94fcecf25527a27ed5481fcbf668c8812 + revision: a6285c16dee9835a1cb28b74b088db482cf1b192 specs: - tdiary-contrib (5.1.3) + tdiary-contrib (5.1.4) coderay pushbullet_ruby tdiary (~> 5.0) GIT remote: https://github.com/tdiary/tdiary-io-mongodb.git - revision: 7c55edb93c9ef0faca7bddf49f292d0304e4a62f + revision: 6cbfeb61de5c5885dad95574bf4cbf188a7ebc27 specs: - tdiary-io-mongodb (5.0.4) + tdiary-io-mongodb (5.1.0) hikidoc mongo (< 2.9.0) mongoid (~> 7.0) @@ -20,9 +20,9 @@ GIT GEM remote: https://rubygems.org/ specs: - activemodel (6.0.3.2) - activesupport (= 6.0.3.2) - activesupport (6.0.3.2) + activemodel (6.0.3.4) + activesupport (= 6.0.3.4) + activesupport (6.0.3.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -30,8 +30,8 @@ GEM zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - bson (4.10.0) - capybara (3.33.0) + bson (4.11.1) + capybara (3.34.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -50,10 +50,10 @@ GEM term-ansicolor (~> 1.3) thor (>= 0.19.4, < 2.0) tins (~> 1.6) - dalli (2.7.10) + dalli (2.7.11) debase (0.2.4.1) debase-ruby_core_source (>= 0.10.2) - debase-ruby_core_source (0.10.10) + debase-ruby_core_source (0.10.11) diff-lcs (1.4.4) docile (1.3.2) emot (0.0.4) @@ -80,21 +80,21 @@ GEM memcachier (0.0.2) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2020.1104) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.1) + minitest (5.14.2) mongo (2.8.0) bson (>= 4.4.2, < 5.0.0) - mongoid (7.1.2) + mongoid (7.1.5) activemodel (>= 5.1, < 6.1) mongo (>= 2.7.0, < 3.0.0) multipart-post (2.1.1) - nio4r (2.5.2) + nio4r (2.5.4) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) oauth (0.5.4) - octokit (4.18.0) + octokit (4.19.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) omniauth (1.9.1) @@ -109,8 +109,8 @@ GEM phantomjs (2.1.1.0) pit (0.0.7) power_assert (1.2.0) - public_suffix (4.0.5) - puma (4.3.5) + public_suffix (4.0.6) + puma (5.0.4) nio4r (~> 2.0) pushbullet_ruby (1.1.4) faraday (>= 0.13.0, < 1.0) @@ -124,20 +124,20 @@ GEM rake (13.0.1) rdtool (0.6.38) redcarpet (3.5.0) - regexp_parser (1.7.1) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.2) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) + regexp_parser (1.8.2) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.0) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.3) + rspec-support (~> 3.10.0) + rspec-support (3.10.0) ruby-debug-ide (0.7.2) rake (>= 0.8.1) ruby-enum (0.8.0) @@ -149,7 +149,7 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - sequel (5.35.0) + sequel (5.38.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -157,7 +157,7 @@ GEM simplecov-html (0.10.2) sqlite3 (1.4.2) sync (0.5.0) - tdiary (5.1.2) + tdiary (5.1.3) bundler (>= 1.3, < 3.0) emot fastimage @@ -174,23 +174,23 @@ GEM rdtool term-ansicolor (1.7.1) tins (~> 1.0) - test-unit (3.3.6) + test-unit (3.3.7) power_assert thor (1.0.1) thread_safe (0.3.6) - tins (1.25.0) + tins (1.26.0) sync twitter-text (3.1.0) idn-ruby unf (~> 0.1.0) - tzinfo (1.2.7) + tzinfo (1.2.8) thread_safe (~> 0.1) unf (0.1.4) unf_ext unf_ext (0.0.7.7) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.4.0) + zeitwerk (2.4.2) PLATFORMS ruby @@ -230,7 +230,7 @@ DEPENDENCIES test-unit RUBY VERSION - ruby 2.7.1p83 + ruby 2.7.2p137 BUNDLED WITH 2.1.4