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

2f639ea1

Commit 2f639ea1 authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'feature/pleromafe-usersearch' into 'develop'

Add Twitter / Pleroma API user search

See merge request pleroma/pleroma!452

parents 38f76d96 e8d8c84f

Branches

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

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

lib/pleroma/user.ex
lib/pleroma/web/router.ex 6 additions, 1 deletion

lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex 7 additions, 0 deletions

lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/user_test.exs 12 additions, 0 deletions

test/user_test.exs
test/web/twitter_api/twitter_api_controller_test.exs 16 additions, 0 deletions

test/web/twitter_api/twitter_api_controller_test.exs

with 42 additions and 2 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