Merge branch 'develop' into openapi/account

2020-04-20 18:37:45 +04:00 · 2020-04-20 18:37:45 +04:00 · 736fead494
commit 736fead494
parent 163341857a 28165dad3a
132 changed files with 1833 additions and 1481 deletions
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@ -294,7 +294,7 @@ defmodule Pleroma.Factory do

  def oauth_app_factory do
    %Pleroma.Web.OAuth.App{
-      client_name: "Some client",
+      client_name: sequence(:client_name, &"Some client #{&1}"),
      redirect_uris: "https://example.com/callback",
      scopes: ["read", "write", "follow", "push", "admin"],
      website: "https://example.com",