diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-18 19:54:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-18 19:54:23 +0100 |
| commit | b9a998f201913dd1c89ddcb0c4c9e181eb73bfcf (patch) | |
| tree | 2d5705651ce83b73900ff3e2ce61d8fef1c1b25d /app/models/status.rb | |
| parent | 6e3a4bcbc70bb33bfb0746cf3b2186ee9f4e6515 (diff) | |
| parent | 841b920af5de8e3188111ca4dbea0c5105bde88c (diff) | |
Merge pull request #963 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/status.rb')
| -rw-r--r-- | app/models/status.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index 440d7cc63..95f336820 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -473,8 +473,8 @@ class Status < ApplicationRecord end def set_visibility + self.visibility = reblog.visibility if reblog? && visibility.nil? self.visibility = (account.locked? ? :private : :public) if visibility.nil? - self.visibility = reblog.visibility if reblog? self.sensitive = false if sensitive.nil? end |