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

3bbefd0a

Commit 3bbefd0a authored 7 years ago by lain

Downloads
- Plain Diff

Merge branch 'twitter-api-blocks' into 'develop'

TwitterAPI: Add blocks.

See merge request pleroma/pleroma!9

parents be67db55 6c0758e0

Branches

Tags

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/router.ex 2 additions, 0 deletions

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

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

lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/web/twitter_api/twitter_api_controller_test.exs 43 additions, 0 deletions

test/web/twitter_api/twitter_api_controller_test.exs
test/web/twitter_api/twitter_api_test.exs 34 additions, 0 deletions

test/web/twitter_api/twitter_api_test.exs

with 115 additions and 0 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