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

47604907

Commit 47604907 authored 5 years ago by lain

Downloads
- Plain Diff

Merge branch 'proper_error_messages' into 'develop'

MastodonController: Return 404 errors correctly.

See merge request pleroma/pleroma!2270

parents 927079e2 f1750b46

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/common_api/common_api.ex 11 additions, 6 deletions

lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/mastodon_api/controllers/status_controller.ex 3 additions, 0 deletions

...pleroma/web/mastodon_api/controllers/status_controller.ex
test/web/admin_api/admin_api_controller_test.exs 2 additions, 2 deletions

test/web/admin_api/admin_api_controller_test.exs
test/web/mastodon_api/controllers/status_controller_test.exs 35 additions, 12 deletions

test/web/mastodon_api/controllers/status_controller_test.exs

with 51 additions and 20 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