diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-18 11:17:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-18 11:17:46 +0100 |
| commit | 00fe0f6cb4a736bbb5e633c567ddf7ac9a09ce69 (patch) | |
| tree | 9ddf09dda84c65904c36dec759834ea446b4ac5d /app/models | |
| parent | f5daa20f2a90098c9d689c5ec9d95ce9887b3a33 (diff) | |
| parent | 8f97ffe91e79c0418666f64b5830d3e74fcc83ba (diff) | |
Merge pull request #2136 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/backup.rb | 2 | ||||
| -rw-r--r-- | app/models/status.rb | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/app/models/backup.rb b/app/models/backup.rb index bec3cbfe5..dca06eb58 100644 --- a/app/models/backup.rb +++ b/app/models/backup.rb @@ -18,6 +18,6 @@ class Backup < ApplicationRecord belongs_to :user, inverse_of: :backups - has_attached_file :dump + has_attached_file :dump, s3_permissions: 'private' validates_attachment_content_type :dump, content_type: /\Aapplication/ end diff --git a/app/models/status.rb b/app/models/status.rb index d053dea44..bf102120e 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -237,16 +237,6 @@ class Status < ApplicationRecord public_visibility? || unlisted_visibility? end - def translatable? - translate_target_locale = I18n.locale.to_s.split(/[_-]/).first - - distributable? && - content.present? && - language != translate_target_locale && - TranslationService.configured? && - TranslationService.configured.supported?(language, translate_target_locale) - end - alias sign? distributable? def with_media? |