[DRE-commits] [diaspora] 01/03: Merge tag 'upstream/0.5.5.1+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 179623c82b55295ddf09eca3244cfae3470cce0b
Merge: a2d22d6 58ff68c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Jan 1 22:59:55 2016 +0530

    Merge tag 'upstream/0.5.5.1+debian'
    
    Upstream version 0.5.5.1+debian
    
    # gpg: Signature made Friday 01 January 2016 10:59:46 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>"

 .rubocop.yml                                       |   5 +
 Changelog.md                                       |  15 ++
 Gemfile                                            |  28 +-
 Gemfile.lock                                       | 144 +++++-----
 app/assets/javascripts/app/app.js                  |  29 +++
 .../javascripts/app/helpers/handlebars-helpers.js  |   8 +-
 app/assets/javascripts/app/views.js                |   3 +
 .../javascripts/app/views/comment_stream_view.js   |   1 -
 app/assets/javascripts/main.js                     |   1 -
 app/assets/javascripts/view.js                     |  48 ----
 app/controllers/posts_controller.rb                |   4 +
 app/models/comment.rb                              |   1 +
 app/models/notification.rb                         |   2 +-
 app/models/reshare.rb                              |   1 +
 app/models/user/social_actions.rb                  |  25 +-
 app/views/people/show.html.haml                    |   2 +-
 config/defaults.yml                                |   2 +-
 config/locales/diaspora/de.yml                     |   2 +-
 config/locales/diaspora/el.yml                     |  82 +++---
 config/locales/diaspora/es-AR.yml                  |  18 +-
 config/locales/diaspora/es.yml                     |  29 ++-
 config/locales/diaspora/fr.yml                     |   6 +-
 config/locales/diaspora/hy.yml                     | 108 ++++----
 config/locales/diaspora/ia.yml                     |  77 ++++--
 config/locales/diaspora/ka.yml                     |   9 +
 config/locales/diaspora/nl.yml                     |   2 +-
 config/locales/diaspora/pl.yml                     |   2 +-
 config/locales/diaspora/pt-BR.yml                  | 289 +++++++++++++--------
 config/locales/diaspora/pt-PT.yml                  | 253 +++++++++---------
 config/locales/diaspora/sc.yml                     |   4 +-
 config/locales/diaspora/sk.yml                     |  96 +++----
 config/locales/diaspora/sv.yml                     |  14 +-
 config/locales/diaspora/zh-TW.yml                  |  27 +-
 config/locales/javascript/javascript.cs.yml        |   1 +
 config/locales/javascript/javascript.da.yml        |   1 +
 config/locales/javascript/javascript.de.yml        |   1 +
 config/locales/javascript/javascript.de_formal.yml |   1 +
 config/locales/javascript/javascript.es-AR.yml     |   1 +
 config/locales/javascript/javascript.es.yml        |   1 +
 config/locales/javascript/javascript.fr.yml        |   1 +
 config/locales/javascript/javascript.hy.yml        |   1 +
 config/locales/javascript/javascript.ia.yml        |  19 ++
 config/locales/javascript/javascript.nl.yml        |   1 +
 config/locales/javascript/javascript.pt-BR.yml     |  27 +-
 config/locales/javascript/javascript.pt-PT.yml     |  14 +-
 config/locales/javascript/javascript.sc.yml        |  15 ++
 config/locales/javascript/javascript.sk.yml        |   1 +
 config/locales/javascript/javascript.sv.yml        |   1 +
 config/locales/javascript/javascript.zh-TW.yml     |  17 +-
 config/sidekiq.yml                                 |   4 +-
 features/desktop/notifications.feature             |  75 ++++++
 lib/diaspora/commentable.rb                        |   3 +
 lib/federated/generator.rb                         |  12 +-
 lib/postzord/receiver/local_batch.rb               |  13 +
 spec/controllers/posts_controller_spec.rb          |  10 +
 spec/integration/profile_spec.rb                   |  72 +++++
 spec/javascripts/app/app_spec.js                   |  78 ++++++
 .../app/helpers/handlebars-helpers_spec.js         |  12 +
 .../app/views/comment_stream_view_spec.js          |   7 -
 spec/javascripts/app/views_spec.js                 |   8 +-
 spec/javascripts/view-spec.js                      |  10 -
 spec/lib/diaspora/federated/generator_spec.rb      |  25 ++
 spec/models/comment_spec.rb                        |   9 +
 spec/models/notification_spec.rb                   |   5 +
 spec/models/reshare_spec.rb                        |   9 +-
 spec/requests_helper.rb                            |   5 +
 spec/spec_helper.rb                                |   7 +
 spec/support/inlined_jobs.rb                       |   2 -
 68 files changed, 1193 insertions(+), 613 deletions(-)

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