diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-27 02:13:34 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 01:19:07 -0600 |
| commit | 8a7020dde819bbabee6bd55dc8a0d3b8b51e258b (patch) | |
| tree | 49637924ee3ba4bcd540d92aa189889d879d0b7a /app/models | |
| parent | 4692c6033fe23c375651e55837550cfb33e49895 (diff) | |
port tootsuite#11963 to monsterfork: Fix relays UI being available in whitelist/secure mode
Fix relays UI referencing relay that is not functional
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/relay.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/models/relay.rb b/app/models/relay.rb index 6934a5c62..8c8a97db3 100644 --- a/app/models/relay.rb +++ b/app/models/relay.rb @@ -12,8 +12,6 @@ # class Relay < ApplicationRecord - PRESET_RELAY = 'https://relay.joinmastodon.org/inbox' - validates :inbox_url, presence: true, uniqueness: true, url: true, if: :will_save_change_to_inbox_url? enum state: [:idle, :pending, :accepted, :rejected] @@ -74,7 +72,6 @@ class Relay < ApplicationRecord end def ensure_disabled - return unless enabled? - disable! + disable! if enabled? end end |