[DRE-commits] [tdiary] 01/08: Merge tag 'upstream/4.2.0'

[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 47bc87ad6dbc17931197ebf67bb3b94c1a4217c6
Merge: e7fe275 0b4fcc3
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Tue Nov 17 12:57:29 2015 +0900

    Merge tag 'upstream/4.2.0'
    
    Upstream version 4.2.0

 ChangeLog                                 | 17 +++++-
 Gemfile                                   |  4 +-
 Gemfile.lock                              | 98 +++++++++++++++----------------
 config.ru                                 |  2 +-
 js/amazon.js                              | 40 ++-----------
 js/{amazon.js => amazon_bitly.js}         |  2 +-
 lib/tdiary/admin.rb                       |  8 ---
 lib/tdiary/application.rb                 | 35 ++++++-----
 lib/tdiary/configuration.rb               | 10 ++--
 lib/tdiary/core_ext.rb                    |  8 ++-
 lib/tdiary/dispatcher/index_main.rb       | 26 ++++----
 lib/tdiary/dispatcher/update_main.rb      | 26 +++-----
 lib/tdiary/filter/spam.rb                 |  4 +-
 lib/tdiary/plugin/00default.rb            | 50 ++++------------
 lib/tdiary/plugin/en/00default.rb         | 62 ++++++++++---------
 lib/tdiary/plugin/en/05referer.rb         |  8 +--
 lib/tdiary/plugin/ja/00default.rb         | 59 +++++++++----------
 lib/tdiary/plugin/ja/05referer.rb         |  8 +--
 lib/tdiary/version.rb                     |  2 +-
 lib/tdiary/view.rb                        |  4 --
 misc/plugin/amazon.rb                     |  6 +-
 misc/plugin/amazon/amazonimg.rb           |  2 +-
 misc/plugin/category.rb                   | 32 ++++------
 misc/plugin/category_autocomplete.rb      |  2 +-
 misc/plugin/comment_emoji_autocomplete.rb |  3 +-
 misc/plugin/edit_today.rb                 | 14 ++---
 misc/plugin/en/pb-show.rb                 |  4 +-
 misc/plugin/en/tb-show.rb                 |  8 +--
 misc/plugin/hide-mail-field.rb            |  4 +-
 misc/plugin/image.rb                      |  4 +-
 misc/plugin/ja/pb-show.rb                 |  4 +-
 misc/plugin/ja/tb-show.rb                 |  8 +--
 misc/plugin/my-ex.rb                      |  4 --
 misc/plugin/my-sequel.rb                  | 20 +++----
 misc/plugin/pb-show.rb                    |  6 --
 misc/plugin/ping.rb                       |  2 +-
 misc/plugin/random_google.rb              | 24 ++++----
 misc/plugin/recent_rss.rb                 |  5 +-
 misc/plugin/speed_comment.rb              |  2 +-
 misc/plugin/tb-show.rb                    |  6 --
 misc/plugin/weather.rb                    | 10 +---
 spec/acceptance/save_conf_dnsbl_spec.rb   |  4 +-
 spec/core/core_ext_spec.rb                |  7 +++
 spec/plugin/plugin_helper.rb              | 12 +---
 views/i.category.rhtml                    |  6 --
 views/i.conf.rhtml                        | 14 -----
 views/i.day.rhtml                         | 28 ---------
 views/i.diary.rhtml                       | 17 ------
 views/i.footer.rhtml                      |  2 -
 views/i.header.rhtml                      |  3 -
 views/i.latest.rhtml                      | 24 --------
 views/i.month.rhtml                       | 39 ------------
 views/i.search.rhtml                      |  5 --
 views/i.update.rhtml                      | 40 -------------
 views/i.update.rhtml.en                   | 40 -------------
 55 files changed, 283 insertions(+), 601 deletions(-)

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