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

9e3899bf

Commit 9e3899bf authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'

Mastodon-based auth error messages. User#auth_active?/1 refactoring.

See merge request pleroma/pleroma!978

parents 21ff78cd b0759f82

Branches

Tags

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

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

lib/pleroma/user.ex
lib/pleroma/web/oauth/oauth_controller.ex 9 additions, 3 deletions

lib/pleroma/web/oauth/oauth_controller.ex
test/web/oauth/oauth_controller_test.exs 2 additions, 2 deletions

test/web/oauth/oauth_controller_test.exs

with 12 additions and 10 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