[DRE-commits] [tdiary] 02/03: Merge tag 'upstream/4.1.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 6547881a1013641ac75fbb3aa34a91313d4f20f8
Merge: a5598dd ddf4ad3
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Fri Jun 5 02:51:53 2015 +0900

    Merge tag 'upstream/4.1.2'
    
    Upstream version 4.1.2

 .travis.yml                                    |   2 +-
 ChangeLog                                      |  42 +++++++++
 Gemfile                                        |  13 +--
 Gemfile.lock                                   | 125 +++++++++++++------------
 README.md                                      |   6 +-
 doc/HOWTO-authenticate-in-rack.md              | 104 ++++++++++++++++++--
 doc/HOWTO-testing-tDiary.md                    |   2 +-
 doc/INSTALL-paas.md                            |  73 ++++-----------
 doc/README.en.md                               |   2 +-
 doc/README.md                                  |   2 +-
 js/comment_ajax.js                             |   2 +-
 lib/tdiary.rb                                  |   1 +
 lib/tdiary/application.rb                      |  95 ++++++++++++-------
 lib/tdiary/application/configuration.rb        |  14 +--
 lib/tdiary/application/extensions/omniauth.rb  |  22 -----
 lib/tdiary/cli.rb                              |  12 ++-
 lib/tdiary/core_ext.rb                         |   2 +-
 lib/tdiary/diary_container.rb                  |  55 +++++++++++
 lib/tdiary/environment.rb                      |   3 +
 lib/tdiary/plugin.rb                           |  15 ++-
 lib/tdiary/plugin/00default.rb                 |   7 +-
 lib/tdiary/plugin/05referer.rb                 |  16 ++--
 lib/tdiary/rack.rb                             |   7 +-
 lib/tdiary/rack/auth.rb                        |  20 ++++
 lib/tdiary/rack/auth/basic.rb                  |   2 +-
 lib/tdiary/rack/auth/omniauth.rb               | 124 +++++++++++++++---------
 lib/tdiary/rack/auth/omniauth/authorization.rb |  64 +++++++++++++
 lib/tdiary/rack/session.rb                     |  35 +++++++
 lib/tdiary/style.rb                            |   3 +-
 lib/tdiary/tasks/assets.rake                   |   2 +-
 lib/tdiary/tasks/release.rake                  |  25 +++--
 lib/tdiary/version.rb                          |   2 +-
 misc/paas/heroku/Gemfile                       |  20 ----
 misc/paas/heroku/Gemfile.local                 |   8 ++
 misc/paas/heroku/Gemfile.lock                  |  74 ---------------
 misc/paas/heroku/app.json                      |  19 ++++
 misc/paas/heroku/config.ru                     |   6 ++
 misc/paas/heroku/tasks/mongodb.rake            |  12 +++
 misc/paas/heroku/tdiary.conf                   |  28 +++---
 misc/plugin/amazon.rb                          |  10 +-
 misc/plugin/category.rb                        |  20 +---
 misc/plugin/category_autocomplete.rb           |   4 +-
 misc/plugin/comment_ajax.rb                    |   2 +
 misc/plugin/comment_emoji_autocomplete.rb      |   4 +-
 misc/plugin/comment_mail-smtp.rb               |  31 ++++--
 misc/plugin/makerss.rb                         |   6 +-
 misc/plugin/recent_comment3.rb                 |   6 +-
 misc/plugin/recent_list.rb                     |   6 +-
 misc/plugin/theme_online.rb                    |  10 +-
 spec/acceptance/save_conf_plugin_spec.rb       |   4 +-
 spec/core/application_spec.rb                  |  65 +++++++++++++
 spec/core/diary_container_spec.rb              |  71 ++++++++++++++
 spec/core/plugin_spec.rb                       |  13 +++
 spec/fixtures/tdiary.conf.gem                  |   4 +-
 spec/fixtures/tdiary.conf.rack                 |   4 +-
 spec/fixtures/tdiary.conf.secure               |   4 +-
 spec/fixtures/tdiary.conf.webrick              |   4 +-
 spec/spec_helper.rb                            |   9 +-
 58 files changed, 890 insertions(+), 453 deletions(-)

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