[DRE-commits] [diaspora] 01/07: Merge tag 'upstream/0.5.4.0+debian'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository diaspora.

commit 2611f56a282230336a35960af84945e8c6fd11eb
Merge: bf46f6e 70497c5
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Oct 29 15:39:20 2015 +0530

    Merge tag 'upstream/0.5.4.0+debian'
    
    Upstream version 0.5.4.0+debian
    
    # gpg: Signature made Thursday 29 October 2015 03:39:12 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 AUTHORS                                            |  16 +-
 Changelog.md                                       |  27 +++
 Gemfile                                            |  64 +++----
 Gemfile.lock                                       | 200 +++++++++++----------
 app/assets/javascripts/app/app.js                  |  20 ++-
 .../javascripts/app/collections/tag_followings.js  |   2 +-
 app/assets/javascripts/app/router.js               |  70 ++++----
 app/assets/javascripts/app/views/hovercard_view.js |   1 +
 .../javascripts/app/views/infinite_stream_view.js  |  11 +-
 .../app/views/notification_dropdown_view.js        |   1 +
 .../javascripts/app/views/stream/shortcuts.js      |  35 ++--
 app/assets/javascripts/app/views/stream_view.js    |   8 +-
 .../app/views/tag_following_list_view.js           |  30 +++-
 app/assets/javascripts/jsxc.js                     |   2 +-
 app/assets/stylesheets/colors.scss                 |   9 -
 app/assets/templates/header_tpl.jst.hbs            |   4 +-
 app/assets/templates/profile_header_tpl.jst.hbs    | 134 +++++++-------
 app/controllers/application_controller.rb          |  34 ++--
 app/controllers/people_controller.rb               |  12 +-
 app/controllers/photos_controller.rb               |   9 +-
 app/controllers/posts_controller.rb                |   8 +-
 app/controllers/report_controller.rb               |  14 +-
 app/controllers/streams_controller.rb              |   1 -
 app/mailers/report_mailer.rb                       |  42 ++---
 app/models/person.rb                               |   5 -
 app/models/photo.rb                                |   9 +
 app/models/role.rb                                 |  13 +-
 app/models/services/tumblr.rb                      |  16 +-
 app/models/user.rb                                 |   8 +
 app/presenters/person_presenter.rb                 |   4 +-
 app/presenters/user_presenter.rb                   |  30 ++--
 app/views/report/index.html.haml                   |   6 +-
 app/views/streams/main_stream.html.haml            |   2 +
 app/workers/mail/report_worker.rb                  |   3 +-
 config/defaults.yml                                |   6 +-
 config/diaspora.yml.example                        |   3 +
 config/locales/diaspora/de.yml                     |   2 +-
 config/locales/javascript/javascript.en.yml        |   1 +
 config/routes.rb                                   |   3 -
 config/unicorn.rb                                  |   1 +
 features/desktop/keyboard_navigation.feature       |  13 ++
 features/desktop/logged_out_browsing.feature       |   5 +-
 features/desktop/public_stream.feature             |  30 ++++
 features/support/env.rb                            |   4 +-
 features/support/matchers.rb                       |   4 +-
 spec/controllers/application_controller_spec.rb    |  30 +++-
 spec/controllers/people_controller_spec.rb         |  41 +++--
 spec/controllers/photos_controller_spec.rb         |  43 +++++
 spec/controllers/posts_controller_spec.rb          |  76 +++++---
 spec/controllers/report_controller_spec.rb         | 165 +++++++++++------
 spec/controllers/streams_controller_spec.rb        |   8 +-
 spec/javascripts/app/router_spec.js                |  69 ++++++-
 spec/javascripts/app/views/hovercard_view_spec.js  |  11 ++
 .../javascripts/app/views/stream/shortcuts_spec.js |  36 +---
 .../app/views/tag_following_list_view_spec.js      |  60 +++++++
 spec/mailers/report_spec.rb                        |  31 ++--
 spec/models/photo_spec.rb                          |  16 ++
 spec/models/role_spec.rb                           |  54 +++++-
 spec/models/services/tumblr_spec.rb                |  76 +++++---
 spec/presenters/person_presenter_spec.rb           |  22 ++-
 60 files changed, 1083 insertions(+), 577 deletions(-)

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