Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

8feb5dcb

Commit 8feb5dcb authored 5 years ago by lain

Downloads
- Plain Diff

Merge branch 'issue/1348' into 'develop'

[#1348] excluded invisible actors from gets  /api/v1/accounts/:id

See merge request pleroma/pleroma!1937

parents 1680a347 e52955c9

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/following_relationship.ex 1 addition, 1 deletion

lib/pleroma/following_relationship.ex
lib/pleroma/user.ex 17 additions, 14 deletions

lib/pleroma/user.ex
lib/pleroma/user/search.ex 5 additions, 0 deletions

lib/pleroma/user/search.ex
lib/pleroma/web/activity_pub/relay.ex 0 additions, 1 deletion

lib/pleroma/web/activity_pub/relay.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex 1 addition, 1 deletion

...leroma/web/mastodon_api/controllers/account_controller.ex
priv/repo/migrations/20191104133100_set_visible_service_actors.exs 22 additions, 0 deletions

.../migrations/20191104133100_set_visible_service_actors.exs
test/following_relationship_test.exs 47 additions, 0 deletions

test/following_relationship_test.exs
test/user_search_test.exs 8 additions, 0 deletions

test/user_search_test.exs
test/user_test.exs 19 additions, 0 deletions

test/user_test.exs
test/web/mastodon_api/controllers/account_controller_test.exs 23 additions, 0 deletions

.../web/mastodon_api/controllers/account_controller_test.exs

with 143 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment