diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-01 19:23:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-01 19:23:31 +0200 |
| commit | 9d4861b4988e07636aa9c02f0732e8228791e9df (patch) | |
| tree | 3151cad0cb134ec63d1d2ba33d6a32aedee1ca93 | |
| parent | ae4f068a845d710c2e60ecf8b49144892505e773 (diff) | |
Remove dependency on running Redis server for db:setup (#18560)
| -rw-r--r-- | app/models/account.rb | 2 | ||||
| -rw-r--r-- | lib/paperclip/attachment_extensions.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index bd94142c4..730ef6293 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -88,7 +88,7 @@ class Account < ApplicationRecord # Local user validations validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' } - validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? } + validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' } validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? } validates :note, note_length: { maximum: 500 }, if: -> { local? && will_save_change_to_note? } validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? } diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb index 786f558e9..d66a17623 100644 --- a/lib/paperclip/attachment_extensions.rb +++ b/lib/paperclip/attachment_extensions.rb @@ -81,6 +81,9 @@ module Paperclip # to respond or don't respond at all and as such minimize the # impact of object storage outages on application throughput def save + # Don't go through Stoplight if we don't have anything object-storage-oriented to do + return super if @queued_for_delete.empty? && @queued_for_write.empty? && !dirty? + Stoplight('object-storage') { super }.with_threshold(STOPLIGHT_THRESHOLD).with_cool_off_time(STOPLIGHT_COOLDOWN).with_error_handler do |error, handle| if error.is_a?(Seahorse::Client::NetworkingError) handle.call(error) |