nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-05-10 14:26:26 +02:00
commit 890029b19e
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog.md
View file

@ -21,7 +21,7 @@ Ruby 2.0 is no longer officially supported.
* Dropped db/seeds.rb [#5896](https://github.com/diaspora/diaspora/pull/5896) * Dropped db/seeds.rb [#5896](https://github.com/diaspora/diaspora/pull/5896)
* Drop broken install scripts [#5907](https://github.com/diaspora/diaspora/pull/5907) * Drop broken install scripts [#5907](https://github.com/diaspora/diaspora/pull/5907)
* Improve invoking mobile site in the testsuite [#5915](https://github.com/diaspora/diaspora/pull/5915) * Improve invoking mobile site in the testsuite [#5915](https://github.com/diaspora/diaspora/pull/5915)
* Do not retry a couple of unrecoverable job failures [#5938](https://github.com/diaspora/diaspora/pull/5938) * Do not retry a couple of unrecoverable job failures [#5938](https://github.com/diaspora/diaspora/pull/5938) [#5942](https://github.com/diaspora/diaspora/pull/5943)
## Bug fixes ## Bug fixes
* Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846) * Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)

7
app/workers/base.rb
View file

@ -21,9 +21,12 @@ module Workers
Rails.logger.info("error on receive: #{e.class}") Rails.logger.info("error on receive: #{e.class}")
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
Rails.logger.info("failed to save received object: #{e.record.errors.full_messages}") Rails.logger.info("failed to save received object: #{e.record.errors.full_messages}")
raise e unless e.message.match(/already been taken/) raise e unless %w(
"already been taken"
"is ignored by the post author"
).any? {|reason| e.message.include? reason }
rescue ActiveRecord::RecordNotUnique => e rescue ActiveRecord::RecordNotUnique => e
Rails.logger.info("failed to save received object: #{e.record.errors.full_messages}") Rails.logger.info("failed to save received object: #{e.message}")
raise e unless %w( raise e unless %w(
index_comments_on_guid index_comments_on_guid
index_likes_on_guid index_likes_on_guid