[DRE-commits] [diaspora] branch master updated (a2d22d6 -> f3249c0)

[Praveen Arimbrathodiyil]

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

praveen pushed a change to branch master
in repository diaspora.

      from  a2d22d6   reupload to unstable
      adds  58ff68c   Imported Upstream version 0.5.5.1+debian
       new  179623c   Merge tag 'upstream/0.5.5.1+debian'
       new  9f1c691   update changelog
       new  f3249c0   refresh patches

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .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 +-
 .../{javascript.gd.yml => javascript.sc.yml}       |   6 +-
 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 +-
 debian/changelog                                   |   6 +
 .../002-remove-development-test-from-gemfile.patch |   8 +-
 debian/patches/007-loosen-roxml-version.patch      |   4 +-
 debian/patches/020-loosen-redcarpet.patch          |  13 -
 debian/patches/030-loosen-tiny-versions.patch      |   2 +-
 debian/patches/032-loosen-rails.patch              |  12 -
 debian/patches/033-relax-nokogiri.patch            |  13 -
 debian/patches/series                              |   3 -
 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 -
 76 files changed, 1194 insertions(+), 664 deletions(-)
 delete mode 100644 app/assets/javascripts/view.js
 copy config/locales/javascript/{javascript.gd.yml => javascript.sc.yml} (78%)
 delete mode 100644 debian/patches/020-loosen-redcarpet.patch
 delete mode 100644 debian/patches/032-loosen-rails.patch
 delete mode 100644 debian/patches/033-relax-nokogiri.patch
 create mode 100644 spec/integration/profile_spec.rb
 create mode 100644 spec/javascripts/app/helpers/handlebars-helpers_spec.js
 delete mode 100644 spec/javascripts/view-spec.js
 create mode 100644 spec/lib/diaspora/federated/generator_spec.rb
 create mode 100644 spec/requests_helper.rb

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