diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-07 11:06:30 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-07 11:06:30 +0300 |
commit | 28fb98d69e31ce5a09e15e213491b880430a0902 (patch) | |
tree | 2910113e8a4ed4d225a4ffc8b6b95d56e782367f /lib/pleroma/web/oauth/oauth_controller.ex | |
parent | f459aabdfafa990b33610438650f882ccac072d2 (diff) | |
parent | b4f3c16885a489c40de82e5ef321caafa4b10c81 (diff) | |
download | pleroma-28fb98d69e31ce5a09e15e213491b880430a0902.tar.gz |
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
-rw-r--r-- | lib/pleroma/web/oauth/oauth_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index 91b1f87cc..03c9a5027 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -475,7 +475,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do defp validate_scopes(app, params) do params |> Scopes.fetch_scopes(app.scopes) - |> Scopes.validates(app.scopes) + |> Scopes.validate(app.scopes) end def default_redirect_uri(%App{} = app) do |