diff options
author | lain <lain@soykaf.club> | 2020-05-16 17:07:09 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-05-16 17:07:09 +0000 |
commit | d15aa9d9503e59b3cd0731394855781f435ec63c (patch) | |
tree | 844810415def046a2fc886d0bc1baeb1ff9afb21 /test/user_search_test.exs | |
parent | 9cf4c4fa73e68f03791c5cc70505b710be39b677 (diff) | |
parent | 3bc1138dd9beec03d2336fa1ad45dd23816f5285 (diff) | |
download | pleroma-d15aa9d9503e59b3cd0731394855781f435ec63c.tar.gz pleroma-d15aa9d9503e59b3cd0731394855781f435ec63c.zip |
Merge branch 'develop' into 'remove-twitter-api'
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
Diffstat (limited to 'test/user_search_test.exs')
-rw-r--r-- | test/user_search_test.exs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/user_search_test.exs b/test/user_search_test.exs index cb847b516..17c63322a 100644 --- a/test/user_search_test.exs +++ b/test/user_search_test.exs @@ -172,6 +172,7 @@ defmodule Pleroma.UserSearchTest do |> Map.put(:search_rank, nil) |> Map.put(:search_type, nil) |> Map.put(:last_digest_emailed_at, nil) + |> Map.put(:multi_factor_authentication_settings, nil) |> Map.put(:notification_settings, nil) assert user == expected |