[DRE-commits] [tdiary] 01/05: Updated version 5.0.5 from 'upstream/5.0.5'

[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 69a1d9b20911186935b3346e4048d3b47ca81aff
Merge: 0f4d39f cc0a96f
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun Aug 20 23:35:49 2017 +0900

    Updated version 5.0.5 from 'upstream/5.0.5'
    
    with Debian dir e56b0e8bd2a54360315e8f381e51ba86f3525221

 ChangeLog                                 |   9 +++
 Gemfile.lock                              |  70 ++++++++++----------
 js/00default.js                           |   2 +-
 js/amazon_bitly.js                        |   2 +-
 js/category_autocomplete.js               |   2 +-
 js/comment_emoji_autocomplete.js          |   4 +-
 js/highlight.js                           |   4 +-
 js/image.js                               |  12 ++--
 js/preview.js                             |   2 +-
 lib/tdiary/core_ext.rb                    |   2 +-
 lib/tdiary/dispatcher/index_main.rb       |   2 +-
 lib/tdiary/dispatcher/update_main.rb      |   2 +-
 lib/tdiary/io/default.rb                  |   2 +-
 lib/tdiary/plugin/00default.rb            |  54 +++++++--------
 lib/tdiary/version.rb                     |   2 +-
 misc/paas/heroku/Gemfile.lock             | 106 +++++++++++++++---------------
 misc/plugin/amazon.rb                     |   2 +-
 misc/plugin/amp.rb                        |  18 +++--
 misc/plugin/category_autocomplete.rb      |   4 +-
 misc/plugin/comment_emoji_autocomplete.rb |   4 +-
 spec/acceptance/save_conf_plugin_spec.rb  |   4 +-
 spec/acceptance/view_comment_spec.rb      |   4 +-
 spec/core/core_ext_spec.rb                |  10 +--
 theme/default/default.css                 |   1 +
 24 files changed, 165 insertions(+), 159 deletions(-)

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