about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-09-27 02:13:34 +0200
committerGitHub <noreply@github.com>2019-09-27 02:13:34 +0200
commitadd4d4118c33562cf196f2045d6ce3aa309a40a0 (patch)
tree88e0403e0a349401806cdf1f11a1937584552ec8 /app/models
parent00d7bdcc2adcc15fe1a95862478cb9b43065a4b0 (diff)
Fix relays UI being available in whitelist/secure mode (#11963)
Fix relays UI referencing relay that is not functional
Diffstat (limited to 'app/models')
-rw-r--r--app/models/relay.rb5
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