[DRE-commits] [diaspora] branch master updated (088e9e6 -> 980716b)
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sat Mar 12 06:24:38 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a change to branch master
in repository diaspora.
from 088e9e6 revert wrap and sort
adds a1beeca Imported Upstream version 0.5.7.1+debian
new 3abbb3d Merge tag 'upstream/0.5.7.1+debian'
new e9822b6 update changelog
new 980716b 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 +-
CODE_OF_CONDUCT.md | 52 +-
Changelog.md | 63 +
Gemfile | 100 +-
Gemfile.lock | 486 +++----
app/assets/images/user/uma.jpg | Bin 68323 -> 0 bytes
app/assets/images/user/wolf.jpg | Bin 25443 -> 0 bytes
app/assets/javascripts/app/pages/profile.js | 1 +
app/assets/javascripts/app/views/hovercard_view.js | 5 +-
.../javascripts/app/views/profile_header_view.js | 1 -
.../javascripts/app/views/stream_post_views.js | 4 +-
app/assets/javascripts/jsxc.js | 6 +-
app/assets/stylesheets/application.scss | 1 -
app/assets/stylesheets/conversations.scss | 1 -
app/assets/stylesheets/stream_element.scss | 1 -
app/controllers/aspect_memberships_controller.rb | 33 +-
app/controllers/invitation_codes_controller.rb | 2 +-
app/controllers/people_controller.rb | 4 +-
app/controllers/posts_controller.rb | 2 +-
app/controllers/publics_controller.rb | 53 -
app/controllers/registrations_controller.rb | 2 +-
app/controllers/status_messages_controller.rb | 1 +
app/models/notification.rb | 2 +
app/models/post.rb | 2 +
app/presenters/post_presenter.rb | 1 -
app/views/errors/error_500.haml | 8 +
app/views/notifications/_notification.haml | 2 +-
app/views/publisher/_publisher.mobile.haml | 5 +-
app/views/users/edit.mobile.haml | 8 +-
app/workers/base.rb | 6 +-
config/defaults.yml | 2 +-
config/initializers/diaspora_federation.rb | 66 +-
config/locale_settings.yml | 2 +-
config/locales/cldr/README.md | 2 +
config/locales/cldr/plurals.rb | 114 +-
config/locales/devise/devise.sq.yml | 125 +-
config/locales/diaspora/en.yml | 20 +-
config/locales/diaspora/sq.yml | 1392 +++++++++++++-------
config/locales/javascript/javascript.en.yml | 1 -
config/locales/javascript/javascript.sq.yml | 215 ++-
config/oembed_providers.yml | 6 +
config/routes.rb | 12 +-
debian/changelog | 7 +
.../002-remove-development-test-from-gemfile.patch | 30 +-
debian/patches/007-loosen-roxml-version.patch | 10 +-
debian/patches/008-add-colorbox.patch | 24 -
debian/patches/019-remove-diaspora-vines.patch | 13 -
debian/patches/030-loosen-tiny-versions.patch | 16 +-
debian/patches/031-embedded-gems.patch | 4 +-
debian/patches/032-relax-omniauth-facebook.patch | 25 -
debian/patches/033-relax-rails-minor-version.patch | 2 +-
debian/patches/044-work-around-sprockets3.patch | 4 +-
debian/patches/045-replace-sidetiq.patch | 57 +-
debian/patches/050-relax-stable-libs.patch | 72 +-
.../patches/051-relax-patch-release-versions.patch | 14 +-
debian/patches/series | 3 -
features/desktop/download_photos.feature | 29 +-
features/desktop/hovercards.feature | 19 +-
features/desktop/keyboard_navigation.feature | 10 +
features/step_definitions/posts_steps.rb | 1 +
features/step_definitions/user_steps.rb | 8 +
features/support/download_helpers.rb | 40 +
features/support/env.rb | 14 +-
lib/assets/javascripts/jquery.mentionsInput.js | 19 +-
lib/diaspora/federated/retraction.rb | 10 +-
lib/diaspora/mentionable.rb | 2 +-
lib/diaspora/relayable.rb | 6 +
lib/federated/relayable.rb | 2 +-
lib/postzord/receiver/public.rb | 13 +-
lib/stream/aspect.rb | 11 -
lib/stream/base.rb | 5 -
lib/stream/comments.rb | 4 -
lib/stream/followed_tag.rb | 4 -
lib/stream/likes.rb | 4 -
lib/stream/mention.rb | 4 -
lib/stream/multi.rb | 5 -
lib/stream/public.rb | 4 -
.../aspect_memberships_controller_spec.rb | 72 +-
spec/controllers/jasmine_fixtures/aspects_spec.rb | 2 +-
spec/controllers/notifications_controller_spec.rb | 10 +-
spec/controllers/publics_controller_spec.rb | 79 --
spec/factories.rb | 3 +
spec/federation_callbacks_spec.rb | 149 +++
spec/integration/federation/federation_helper.rb | 68 +
.../federation/receive_federation_messages_spec.rb | 153 +++
.../federation/shared_receive_relayable.rb | 59 +
.../federation/shared_receive_retraction.rb | 57 +
.../federation/shared_receive_stream_items.rb | 166 +++
.../javascripts/app/helpers/text_formatter_spec.js | 2 +-
spec/javascripts/app/views/hovercard_view_spec.js | 56 +-
spec/javascripts/helpers/factory.js | 12 +-
spec/lib/diaspora/mentionable_spec.rb | 88 +-
spec/models/mention_spec.rb | 1 -
spec/models/notification_spec.rb | 4 +
spec/shared_behaviors/stream.rb | 4 -
spec/spec_helper.rb | 2 +
spec/support/fixture_builder.rb | 4 +-
97 files changed, 2803 insertions(+), 1497 deletions(-)
delete mode 100644 app/assets/images/user/uma.jpg
delete mode 100644 app/assets/images/user/wolf.jpg
delete mode 100644 app/controllers/publics_controller.rb
delete mode 100644 debian/patches/008-add-colorbox.patch
delete mode 100644 debian/patches/019-remove-diaspora-vines.patch
delete mode 100644 debian/patches/032-relax-omniauth-facebook.patch
create mode 100644 features/support/download_helpers.rb
delete mode 100644 spec/controllers/publics_controller_spec.rb
create mode 100644 spec/integration/federation/federation_helper.rb
create mode 100644 spec/integration/federation/receive_federation_messages_spec.rb
create mode 100644 spec/integration/federation/shared_receive_relayable.rb
create mode 100644 spec/integration/federation/shared_receive_retraction.rb
create mode 100644 spec/integration/federation/shared_receive_stream_items.rb
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git
More information about the Pkg-ruby-extras-commits
mailing list