[DRE-commits] [diaspora] branch master updated (23e7f5c -> e69d051)
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Tue Jul 28 11:43:44 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a change to branch master
in repository diaspora.
from 23e7f5c don't use ruby helper (leads to conflicts)
adds ca165f0 Imported Upstream version 0.5.2.0+debian
new 1f06914 Merge tag 'upstream/0.5.2.0+debian'
new 9373dc0 update changelog
new 50bac97 refresh patch modified: debian/patches/002-remove-development-test-from-gemfile.patch
new e9986c1 remove patch deleted: debian/patches/005-loosen-rails-version.patch
new ff26af7 refresh patch modified: debian/patches/006-loosen-messagebus-ruby-api-version.patch
new a7ac00d refresh patch modified: debian/patches/007-loosen-roxml-version.patch
new ef97ff4 refresh patches modified: debian/patches/010-loosen-responders-version.patch modified: debian/patches/018-loosen-rails-timeago.patch
new 9b5b766 refresh patches
new cd90684 refresh patch modified: debian/patches/030-loosen-tiny-versions.patch
new 38455bf refresh patch modified: debian/patches/031-embedded-gems.patch
new e69d051 refresh patches modified: debian/patches/040-disable-raise_in_transactional_callbacks.patch
The 11 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:
.travis.yml | 2 +
Changelog.md | 24 +++
Gemfile | 74 ++++----
app/assets/javascripts/app/app.js | 2 +-
.../app/views/notification_dropdown_view.js | 14 +-
app/assets/javascripts/main.js | 1 -
app/assets/stylesheets/markdown-content.scss | 6 +
app/assets/templates/tag_following_tpl.jst.hbs | 2 +-
app/controllers/publics_controller.rb | 28 ---
app/controllers/registrations_controller.rb | 3 +-
app/helpers/jsxc_helper.rb | 3 +-
app/helpers/layout_helper.rb | 3 +-
app/helpers/people_helper.rb | 4 -
app/helpers/publics_helper.rb | 21 ---
app/models/conversation.rb | 5 +-
app/models/person.rb | 73 ++++----
app/models/user.rb | 19 +-
app/serializers/export/comment_serializer.rb | 3 +-
app/serializers/export/post_serializer.rb | 3 +-
app/views/publics/hcard.haml | 50 ------
app/views/publics/host_meta.erb | 10 --
app/views/publics/webfinger.erb | 14 --
app/views/shared/_links.haml | 3 +-
app/views/shared/_public_explain.haml | 2 +-
app/views/shared/_stream_more_button.mobile.haml | 2 +-
app/views/users/public.atom.builder | 18 +-
app/workers/clean_cached_files.rb | 13 ++
app/workers/publish_to_hub.rb | 5 +-
config/application.rb | 3 +
config/defaults.yml | 9 +-
config/diaspora.yml.example | 31 ++++
config/environments/test.rb | 3 +
config/initializers/diaspora_federation.rb | 43 +++++
config/locales/diaspora/br.yml | 135 +++++++++++---
config/locales/diaspora/cs.yml | 2 +
config/locales/diaspora/da.yml | 1 +
config/locales/diaspora/de.yml | 100 ++++++-----
config/locales/diaspora/de_formal.yml | 110 +++++++-----
config/locales/diaspora/en.yml | 4 +-
config/locales/diaspora/es-AR.yml | 8 +
config/locales/diaspora/es-VE.yml | 2 +
config/locales/diaspora/es.yml | 1 +
config/locales/diaspora/fr.yml | 25 +--
config/locales/diaspora/hu.yml | 4 +-
config/locales/diaspora/hy.yml | 49 +++---
config/locales/diaspora/ia.yml | 2 +-
config/locales/diaspora/lv.yml | 1 +
config/locales/diaspora/nl.yml | 17 +-
config/locales/diaspora/pl.yml | 2 +
config/locales/diaspora/ro.yml | 4 +-
config/locales/diaspora/ru.yml | 17 +-
config/locales/diaspora/sv.yml | 30 ++--
config/locales/diaspora/te.yml | 99 ++++++++++-
config/locales/diaspora/uk.yml | 195 +++++++++++++--------
config/locales/javascript/javascript.br.yml | 15 +-
config/locales/javascript/javascript.de.yml | 13 +-
config/locales/javascript/javascript.de_formal.yml | 18 +-
config/locales/javascript/javascript.es-AR.yml | 7 +
config/locales/javascript/javascript.es-VE.yml | 1 +
config/locales/javascript/javascript.uk.yml | 20 +--
config/logging.rb | 8 +-
config/routes.rb | 5 +-
debian/changelog | 2 +-
.../002-remove-development-test-from-gemfile.patch | 18 +-
debian/patches/005-loosen-rails-version.patch | 12 --
.../006-loosen-messagebus-ruby-api-version.patch | 2 +-
debian/patches/007-loosen-roxml-version.patch | 4 +-
debian/patches/010-loosen-responders-version.patch | 4 +-
debian/patches/018-loosen-rails-timeago.patch | 2 +-
debian/patches/020-loosen-minor-versions.patch | 26 +--
debian/patches/030-loosen-tiny-versions.patch | 43 ++---
debian/patches/031-embedded-gems.patch | 4 +-
...-disable-raise_in_transactional_callbacks.patch | 2 +-
debian/patches/series | 1 -
features/desktop/signs_up.feature | 9 +
features/mobile/more-button.feature | 43 +++++
features/step_definitions/custom_web_steps.rb | 4 +
features/step_definitions/posts_steps.rb | 7 +
features/step_definitions/user_steps.rb | 6 +-
features/support/poor_mans_webmock.rb | 12 +-
lib/configuration_methods.rb | 12 +-
lib/postzord/dispatcher.rb | 2 +-
lib/postzord/receiver/private.rb | 2 +-
.../diaspora_federation_controller_spec.rb | 36 ++++
spec/controllers/publics_controller_spec.rb | 70 --------
spec/federation_callbacks_spec.rb | 56 ++++++
spec/helpers/jsxc_helper_spec.rb | 1 +
spec/helpers/people_helper_spec.rb | 20 +--
spec/javascripts/app/views_spec.js | 2 +-
spec/lib/configuration_methods_spec.rb | 23 ++-
spec/lib/postzord/dispatcher_spec.rb | 2 +-
spec/models/account_deletion_spec.rb | 87 ++++-----
spec/models/acts_as_taggable_on_tag_spec.rb | 48 ++---
spec/models/aspect_membership_spec.rb | 26 ++-
spec/models/aspect_spec.rb | 44 ++---
spec/models/block_spec.rb | 10 +-
spec/models/comment_spec.rb | 140 ++++++++-------
spec/models/contact_spec.rb | 154 ++++++++--------
spec/models/conversation_spec.rb | 184 ++++++++++---------
spec/models/conversation_visibilities_spec.rb | 31 ++--
spec/models/person_spec.rb | 89 ++++++++--
spec/models/photo_spec.rb | 48 ++---
spec/models/user_spec.rb | 48 +++++
spec/serializers/comment_serializer_spec.rb | 10 ++
spec/serializers/post_serializer_spec.rb | 20 +++
spec/workers/http_multi_spec.rb | 6 +-
spec/workers/publish_to_hub_spec.rb | 12 +-
107 files changed, 1650 insertions(+), 1125 deletions(-)
delete mode 100644 app/helpers/publics_helper.rb
delete mode 100644 app/views/publics/hcard.haml
delete mode 100644 app/views/publics/host_meta.erb
delete mode 100644 app/views/publics/webfinger.erb
create mode 100644 app/workers/clean_cached_files.rb
create mode 100644 config/initializers/diaspora_federation.rb
delete mode 100644 debian/patches/005-loosen-rails-version.patch
create mode 100644 features/mobile/more-button.feature
create mode 100644 spec/controllers/diaspora_federation_controller_spec.rb
create mode 100644 spec/federation_callbacks_spec.rb
create mode 100644 spec/serializers/comment_serializer_spec.rb
create mode 100644 spec/serializers/post_serializer_spec.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