hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/funkwhale-audio' into 'develop'

Browse source 
Add support for funkwhale Audio activity

Closes #764 and #1624

See merge request pleroma/pleroma!2287
This commit is contained in:
Haelwenn 2020-03-29 19:18:22 +00:00 • committed by rinpatch
commit b0a9a02af3
7 changed files with 124 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/web/oauth/oauth_controller_test.exs
View file

@ -581,7 +581,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
# In case scope param is missing, expecting _all_ app-supported scopes to be granted
for user <- [non_admin, admin],
{requested_scopes, expected_scopes} <-
%{scopes_subset => scopes_subset, nil => app_scopes} do
%{scopes_subset => scopes_subset, nil: app_scopes} do
conn =
post(
build_conn(),