diff options
| author | ThibG <thib@sitedethib.com> | 2020-06-24 17:06:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-24 17:06:26 +0200 |
| commit | 8f4aff9b6fe638b26b9d0bf0fe4151c2cc214d6d (patch) | |
| tree | 89b283a87f3ff82b24148636594c0837aa34b322 /app/controllers/api | |
| parent | 5d12b63e79953a7596ae473706985b774d4e51a6 (diff) | |
| parent | 72d193654b9369b43090a4de2e197c21c30f3f31 (diff) | |
Merge pull request #1361 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api')
| -rw-r--r-- | app/controllers/api/base_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 153ade253..045e7dd26 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -7,7 +7,7 @@ class Api::BaseController < ApplicationController include RateLimitHeaders skip_before_action :store_current_location - skip_before_action :require_functional! + skip_before_action :require_functional!, unless: :whitelist_mode? before_action :require_authenticated_user!, if: :disallow_unauthenticated_api_access? before_action :set_cache_headers |