Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions

# Conflicts: # CHANGELOG.md
2019-10-07 11:06:30 +03:00 · 2019-10-07 11:06:30 +03:00 · 28fb98d69e
commit 28fb98d69e
parent f459aabdfa b4f3c16885
47 changed files with 759 additions and 301 deletions
--- 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