diff options
| author | minibikini <egor@kislitsyn.com> | 2020-06-04 13:29:32 +0000 |
|---|---|---|
| committer | minibikini <egor@kislitsyn.com> | 2020-06-04 13:29:32 +0000 |
| commit | b57e4ad1abd6fa0c0597b4343528e211c84b50c1 (patch) | |
| tree | 31728d70194b6e578d4fe5d9c3edcb3e31a77de8 /lib/pleroma/web/router.ex | |
| parent | 70f054b0836e81e5c3572634af56c9deb03d2ae0 (diff) | |
| parent | f5cb1f3616e9cb9430038697532eb49161937dec (diff) | |
| download | pleroma-b57e4ad1abd6fa0c0597b4343528e211c84b50c1.tar.gz | |
Merge branch 'develop' into 'openapi/admin/relay'
# Conflicts:
# lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 553e06f6a..be4d8ed63 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -194,9 +194,9 @@ defmodule Pleroma.Web.Router do delete("/statuses/:id", StatusController, :delete) get("/statuses", StatusController, :index) - get("/config", AdminAPIController, :config_show) - post("/config", AdminAPIController, :config_update) - get("/config/descriptions", AdminAPIController, :config_descriptions) + get("/config", ConfigController, :show) + post("/config", ConfigController, :update) + get("/config/descriptions", ConfigController, :descriptions) get("/need_reboot", AdminAPIController, :need_reboot) get("/restart", AdminAPIController, :restart) |