Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Schubert <mail@dennis-schubert.de>2016-01-24 09:15:04 +0300
committerDennis Schubert <mail@dennis-schubert.de>2016-01-24 09:15:04 +0300
commit515cda765869d5f06897f5c6c491418f60a36907 (patch)
treee4af0eb2c5129df08f5beaa7129ffdf4e23c419f /app/workers
parentb1aa8aacfdc4b98ac05dec27c01b3ebc9a4e1460 (diff)
parent44ab0df02b1ab165373904c5ec75454fc76d54b4 (diff)
Merge branch 'stable' into develop
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/base.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/workers/base.rb b/app/workers/base.rb
index d410a103d..b8a26d31e 100644
--- a/app/workers/base.rb
+++ b/app/workers/base.rb
@@ -24,10 +24,10 @@ module Workers
logger.warn "error on receive: #{e.class}"
rescue ActiveRecord::RecordInvalid => e
logger.warn "failed to save received object: #{e.record.errors.full_messages}"
- raise e unless %w(
- "already been taken"
+ raise e unless [
+ "already been taken",
"is ignored by the post author"
- ).any? {|reason| e.message.include? reason }
+ ].any? {|reason| e.message.include? reason }
end
end
end