about summary refs log tree commit diff
path: root/app/controllers/api/v1/instances/peers_controller.rb
diff options
context:
space:
mode:
authorReverite <github@reverite.sh>2019-07-31 01:41:31 -0700
committerReverite <github@reverite.sh>2019-07-31 01:41:31 -0700
commit7a312a38f904e853f5703a0b678d0aec83fa858c (patch)
treeeba4b787f6a617e1c2c5f7d4b5be66320212be1d /app/controllers/api/v1/instances/peers_controller.rb
parent3013c6cb78358ed8a95a35d5db79608fcb06963f (diff)
parent4ecfa8f298399d9857737f212fc8f5767ffa7c6d (diff)
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/api/v1/instances/peers_controller.rb')
-rw-r--r--app/controllers/api/v1/instances/peers_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/api/v1/instances/peers_controller.rb b/app/controllers/api/v1/instances/peers_controller.rb
index 450e6502f..75c3cb4ba 100644
--- a/app/controllers/api/v1/instances/peers_controller.rb
+++ b/app/controllers/api/v1/instances/peers_controller.rb
@@ -2,6 +2,7 @@
 
 class Api::V1::Instances::PeersController < Api::BaseController
   before_action :require_enabled_api!
+
   skip_before_action :set_cache_headers
 
   respond_to :json
@@ -14,6 +15,6 @@ class Api::V1::Instances::PeersController < Api::BaseController
   private
 
   def require_enabled_api!
-    head 404 unless Setting.peers_api_enabled
+    head 404 unless Setting.peers_api_enabled && !whitelist_mode?
   end
 end