[DRE-commits] [tdiary] 01/03: Merge tag 'upstream/5.0.4'

[Youhei SASAKI]

This is an automated email from the git hooks/post-receive script.

uwabami-guest pushed a commit to branch master
in repository tdiary.

commit b247afa8a623ba8a4040f0ae1320d73b128211d6
Merge: afdeff5 6dfa941
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun May 14 19:47:43 2017 +0900

    Merge tag 'upstream/5.0.4'
    
    Upstream version 5.0.4

 .editorconfig                       |   6 +
 .travis.yml                         |   6 +-
 ChangeLog                           |  42 +++-
 Gemfile                             |   2 +-
 Gemfile.lock                        |  81 ++++---
 doc/HOWTO-authenticate-in-rack.md   |   2 +-
 doc/HOWTO-make-plugin.md            |   2 +-
 index.fcgi                          |   2 +-
 lib/tdiary/configuration.rb         |  11 +-
 lib/tdiary/core_ext.rb              |   4 +-
 lib/tdiary/filter/spam.rb           |   6 +-
 lib/tdiary/plugin/00default.rb      |  18 +-
 lib/tdiary/plugin/10spamfilter.rb   |  10 +-
 lib/tdiary/tasks/release.rake       |   2 +-
 lib/tdiary/version.rb               |   2 +-
 misc/paas/heroku/Gemfile.local      |   6 +-
 misc/paas/heroku/Gemfile.lock       | 154 ++++++------
 misc/plugin/amazon.rb               |   2 +-
 misc/plugin/amp.rb                  | 110 +++++++++
 misc/plugin/category-legacy.rb      |  16 +-
 misc/plugin/category.rb             |  16 +-
 misc/plugin/en/search_form.rb       |  10 +-
 misc/plugin/ja/disp_referrer.rb     |  10 +-
 misc/plugin/ja/search_form.rb       |  10 +-
 misc/plugin/kw.rb                   |   4 +-
 misc/plugin/my-sequel.rb            |   2 +-
 misc/plugin/random_google.rb        |   2 +-
 misc/plugin/xmlrpc/xmlrpc.rb        |   1 -
 misc/theme_convert/Readme.rd        |  21 --
 misc/theme_convert/append.rcss      | 150 ------------
 misc/theme_convert/theme_convert.rb | 452 ------------------------------------
 spec/fixtures/tdiary.conf.gem       |   2 +-
 spec/fixtures/tdiary.conf.rack      |   2 +-
 spec/fixtures/tdiary.conf.webrick   |   2 +-
 spec/plugin/amp_spec.rb             | 120 ++++++++++
 spec/plugin/plugin_helper.rb        |   9 +
 tdiary.conf.beginner                |   2 +-
 update.fcgi                         |   2 +-
 views/amp.rhtml                     |  34 +++
 views/footer.rhtml                  |   2 +-
 views/tdiary.rconf                  |   2 +-
 41 files changed, 507 insertions(+), 832 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/tdiary.git