Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

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

Snippets Groups Projects

b640cf0c

Commit b640cf0c authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'scarlett/pleroma-search-visibility-check' into 'develop'

Scarlett/pleroma search visibility check

See merge request pleroma/pleroma!635

parents b0e8e521 7dcafb48

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 8 additions, 5 deletions

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
test/web/mastodon_api/mastodon_api_controller_test.exs 18 additions, 0 deletions

test/web/mastodon_api/mastodon_api_controller_test.exs

with 26 additions and 5 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