aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/admin_api
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-01-11 12:15:42 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-01-11 12:15:42 +0300
commit1630ecaa20894c6e18b83ce1a830184d577150c3 (patch)
tree877c35b3441ca7431ead3d528ae07f1b8e36d62b /lib/pleroma/web/admin_api
parent3453b27015dfa26bc6fd59899541eadfce2cacee (diff)
parent05ca420c0994b079116b40ea5a84214b50d56d0e (diff)
downloadpleroma-1630ecaa20894c6e18b83ce1a830184d577150c3.tar.gz
Merge branch 'develop' into admin-be
Diffstat (limited to 'lib/pleroma/web/admin_api')
-rw-r--r--lib/pleroma/web/admin_api/admin_api_controller.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex
index a13dd4775..ce5411e8a 100644
--- a/lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/admin_api_controller.ex
@@ -88,7 +88,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
plug(
OAuthScopesPlug,
%{scopes: ["read"], admin: true}
- when action in [:config_show, :migrate_to_db, :migrate_from_db, :list_log]
+ when action in [:config_show, :migrate_from_db, :list_log]
)
plug(