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:
Dennis Schubert 2015-05-26 05:25:43 +02:00
commit 8c408a57ae
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/workers/base.rb
View file

@ -25,16 +25,6 @@ module Workers
"already been taken" "already been taken"
"is ignored by the post author" "is ignored by the post author"
).any? {|reason| e.message.include? reason } ).any? {|reason| e.message.include? reason }
rescue ActiveRecord::RecordNotUnique => e
Rails.logger.info("failed to save received object: #{e.message}")
raise e unless %w(
index_comments_on_guid
index_likes_on_guid
index_posts_on_guid
"duplicate key in table 'comments'"
"duplicate key in table 'likes'"
"duplicate key in table 'posts'"
).any? {|index| e.message.include? index }
end end
private private