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

7561158a

Commit 7561158a authored 7 years ago by lain

Downloads
- Plain Diff

Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma...

Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus

parents c5fa682c e8882ab3

Branches

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/user.ex 1 addition, 0 deletions

lib/pleroma/user.ex
lib/pleroma/web/ostatus/activity_representer.ex 3 additions, 1 deletion

lib/pleroma/web/ostatus/activity_representer.ex
lib/pleroma/web/ostatus/feed_representer.ex 2 additions, 1 deletion

lib/pleroma/web/ostatus/feed_representer.ex
lib/pleroma/web/twitter_api/twitter_api.ex 8 additions, 8 deletions

lib/pleroma/web/twitter_api/twitter_api.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex 38 additions, 20 deletions

lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/support/factory.ex 4 additions, 2 deletions

test/support/factory.ex
test/web/ostatus/activity_representer_test.exs 2 additions, 0 deletions

test/web/ostatus/activity_representer_test.exs
test/web/ostatus/feed_representer_test.exs 1 addition, 1 deletion

test/web/ostatus/feed_representer_test.exs
test/web/twitter_api/twitter_api_controller_test.exs 29 additions, 8 deletions

test/web/twitter_api/twitter_api_controller_test.exs
test/web/twitter_api/twitter_api_test.exs 27 additions, 12 deletions

test/web/twitter_api/twitter_api_test.exs

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