[DRE-commits] [tdiary] 01/02: Merge tag 'upstream/5.0.2'

[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 2a92b9733a35bf51f1fbc8c4633cc3bb0f943453
Merge: ae46b0c a3abdf4
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Oct 3 19:31:17 2016 +0900

    Merge tag 'upstream/5.0.2'
    
    Upstream version 5.0.2

 .gitignore                                |  20 ---
 .travis.yml                               |   8 +-
 ChangeLog                                 |  10 ++
 Gemfile                                   |   2 +-
 Gemfile.lock                              |  38 ++--
 doc/INSTALL-cgi.md                        |  14 +-
 doc/INSTALL-rack.md                       |  16 ++
 doc/INSTALL.md                            |  12 +-
 js/comment_emoji_autocomplete.js          |  61 ++++---
 lib/tdiary/cli.rb                         |  22 +--
 lib/tdiary/core_ext.rb                    |   2 +-
 lib/tdiary/dispatcher.rb                  |   4 +-
 lib/tdiary/environment.rb                 |  16 ++
 lib/tdiary/plugin.rb                      |   4 +-
 lib/tdiary/plugin/00default.rb            |  31 +++-
 lib/tdiary/server.rb                      |  14 +-
 lib/tdiary/style/wiki.rb                  |  10 +-
 lib/tdiary/tasks/release.rake             | 281 +++++++++++++++---------------
 lib/tdiary/version.rb                     |   2 +-
 misc/paas/heroku/Gemfile.local            |   2 +-
 misc/paas/heroku/Gemfile.lock             | 127 +++++++-------
 misc/plugin/amazon.rb                     |  30 +++-
 spec/acceptance/save_conf_default_spec.rb |   2 +-
 spec/acceptance/view_comment_spec.rb      |   4 +-
 spec/acceptance/view_diary_spec.rb        |   2 +-
 spec/core/core_ext_spec.rb                |  10 +-
 spec/plugin/bq_spec.rb                    |   2 +-
 tdiary.gemspec                            |   9 +-
 test/disp_referrer_test.rb                |   2 +-
 theme/base.css                            |  10 +-
 theme/default/default.css                 |  16 +-
 31 files changed, 424 insertions(+), 359 deletions(-)

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