diff options
| author | lain <lain@soykaf.club> | 2020-10-13 11:33:39 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-10-13 11:33:39 +0000 |
| commit | 5ed7eb1a26a43c1761b4df9cdcaa24e1c46d8214 (patch) | |
| tree | 3580438ef86da0369f3f6932ce9683c81f042c68 /lib/pleroma/web/twitter_api/controllers | |
| parent | 42b4b95467ad967dd81d01b99e590ac14fe7afe4 (diff) | |
| parent | 83ae45b000261d3e03a4b554064350a5ead172c3 (diff) | |
| download | pleroma-5ed7eb1a26a43c1761b4df9cdcaa24e1c46d8214.tar.gz | |
Merge branch 'preload-frontend-config' into 'develop'
Preload `/api/pleroma/frontend_configurations`, fixes #1932
Closes #1932
See merge request pleroma/pleroma!3075
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 70b0fbd54..6d827846d 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -74,11 +74,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do end def frontend_configurations(conn, _params) do - config = - Config.get(:frontend_configurations, %{}) - |> Enum.into(%{}) - - json(conn, config) + render(conn, "frontend_configurations.json") end def emoji(conn, _params) do |