Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

297596ce

Commit 297596ce authored 5 years ago by lain

Downloads
- Plain Diff

Merge branch 'harmonize_return_types_in_user_module' into 'develop'

Harmonize return types in user module

Closes #718

See merge request pleroma/pleroma!1112

parents a7c9e3b2 f11e7037

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

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

lib/mix/tasks/pleroma/user.ex
lib/pleroma/user.ex 21 additions, 13 deletions

lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub_controller.ex 1 addition, 1 deletion

lib/pleroma/web/activity_pub/activity_pub_controller.ex
lib/pleroma/web/activity_pub/relay.ex 2 additions, 2 deletions

lib/pleroma/web/activity_pub/relay.ex
lib/pleroma/web/activity_pub/transmogrifier.ex 13 additions, 13 deletions

lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 1 addition, 1 deletion

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/twitter_api/twitter_api.ex 1 addition, 1 deletion

lib/pleroma/web/twitter_api/twitter_api.ex
test/formatter_test.exs 1 addition, 1 deletion

test/formatter_test.exs
test/user_test.exs 12 additions, 12 deletions

test/user_test.exs
test/web/activity_pub/transmogrifier_test.exs 1 addition, 1 deletion

test/web/activity_pub/transmogrifier_test.exs

with 54 additions and 46 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