Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream

2017-09-28 09:12:17 +02:00
parent 06e299cef5 4aea3f88a6
commit 9330ea1f4d
282 changed files with 4626 additions and 1622 deletions
--- a/app/validators/status_pin_validator.rb
+++ b/app/validators/status_pin_validator.rb
@ -5,5 +5,6 @@ class StatusPinValidator < ActiveModel::Validator
    pin.errors.add(:status, I18n.t('statuses.pin_errors.reblog')) if pin.status.reblog?
    pin.errors.add(:status, I18n.t('statuses.pin_errors.ownership')) if pin.account_id != pin.status.account_id
    pin.errors.add(:status, I18n.t('statuses.pin_errors.private')) unless %w(public unlisted).include?(pin.status.visibility)
+    pin.errors.add(:status, I18n.t('statuses.pin_errors.limit')) if pin.account.status_pins.count > 4
  end
 end