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

69008515

Commit 69008515 authored 7 years ago by lain

Downloads
- Plain Diff

Merge branch 'fix/self-follow' into 'develop'

Fix self follows to be more intuitive, fix minor websocket channel issue

See merge request pleroma/pleroma!26

parents 52aa65fe bd921ca5

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/user.ex 6 additions, 5 deletions

lib/pleroma/user.ex
test/support/factory.ex 1 addition, 1 deletion

test/support/factory.ex
test/user_test.exs 12 additions, 2 deletions

test/user_test.exs
test/web/twitter_api/twitter_api_controller_test.exs 3 additions, 3 deletions

test/web/twitter_api/twitter_api_controller_test.exs
test/web/twitter_api/twitter_api_test.exs 2 additions, 2 deletions

test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/views/user_view_test.exs 2 additions, 1 deletion

test/web/twitter_api/views/user_view_test.exs

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