diff options
author | kaniini <nenolod@gmail.com> | 2019-02-01 20:23:55 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-02-01 20:23:55 +0000 |
commit | 09e1c8c05dedf96710571a55f0be65fdff4ccdd0 (patch) | |
tree | d639c4f000b3ecafa6c5b7ea8b99f25557ac5141 /test/web/twitter_api/views | |
parent | 28bfb09b01d324e149e9f36a74db2674a07b07da (diff) | |
parent | 486749064f72ac5078a42ed339519afbbf48027a (diff) | |
download | pleroma-09e1c8c05dedf96710571a55f0be65fdff4ccdd0.tar.gz pleroma-09e1c8c05dedf96710571a55f0be65fdff4ccdd0.zip |
Merge branch 'revert-0a82a7e6' into 'develop'
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
See merge request pleroma/pleroma!758
Diffstat (limited to 'test/web/twitter_api/views')
-rw-r--r-- | test/web/twitter_api/views/user_view_test.exs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs index 0885afaec..daf18c1c5 100644 --- a/test/web/twitter_api/views/user_view_test.exs +++ b/test/web/twitter_api/views/user_view_test.exs @@ -100,8 +100,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "locked" => false, "default_scope" => "public", "no_rich_text" => false, - "hide_followings" => false, - "hide_followers" => false, + "hide_network" => false, "fields" => [], "pleroma" => %{ "confirmation_pending" => false, @@ -148,8 +147,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "locked" => false, "default_scope" => "public", "no_rich_text" => false, - "hide_followings" => false, - "hide_followers" => false, + "hide_network" => false, "fields" => [], "pleroma" => %{ "confirmation_pending" => false, @@ -197,8 +195,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "locked" => false, "default_scope" => "public", "no_rich_text" => false, - "hide_followings" => false, - "hide_followers" => false, + "hide_network" => false, "fields" => [], "pleroma" => %{ "confirmation_pending" => false, @@ -260,8 +257,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "locked" => false, "default_scope" => "public", "no_rich_text" => false, - "hide_followings" => false, - "hide_followers" => false, + "hide_network" => false, "fields" => [], "pleroma" => %{ "confirmation_pending" => false, |