projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'with-mutes' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
oauth
/
oauth_controller.ex
diff --git
a/lib/pleroma/web/oauth/oauth_controller.ex
b/lib/pleroma/web/oauth/oauth_controller.ex
index 02c0babd24080f75bc936f0a48aa10b8c1b17c81..5c2b0507c9a0c8c5dc48fb0dff643986c22d55b8 100644
(file)
--- a/
lib/pleroma/web/oauth/oauth_controller.ex
+++ b/
lib/pleroma/web/oauth/oauth_controller.ex
@@
-25,7
+25,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
available_scopes = (app && app.scopes) || []
scopes = oauth_scopes(params, nil) || available_scopes
available_scopes = (app && app.scopes) || []
scopes = oauth_scopes(params, nil) || available_scopes
- template =
Application.get_env(:pleroma,
:auth_template, "show.html")
+ template =
Pleroma.Config.get(
:auth_template, "show.html")
render(conn, template, %{
response_type: params["response_type"],
render(conn, template, %{
response_type: params["response_type"],