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

8ca1f3e8

Commit 8ca1f3e8 authored 4 years ago by lain

Downloads
- Plain Diff

Merge branch '1723-token-fixes' into 'develop'

AccountController: Return scope in proper format.

Closes #1723

See merge request pleroma/pleroma!2694

parents f4469dc7 59540131

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/api_spec/operations/account_operation.ex 11 additions, 4 deletions

lib/pleroma/web/api_spec/operations/account_operation.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex 2 additions, 6 deletions

...leroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/oauth/mfa_controller.ex 2 additions, 1 deletion

lib/pleroma/web/oauth/mfa_controller.ex
lib/pleroma/web/oauth/mfa_view.ex 9 additions, 0 deletions

lib/pleroma/web/oauth/mfa_view.ex
lib/pleroma/web/oauth/oauth_controller.ex 7 additions, 9 deletions

lib/pleroma/web/oauth/oauth_controller.ex
lib/pleroma/web/oauth/oauth_view.ex 22 additions, 0 deletions

lib/pleroma/web/oauth/oauth_view.ex
lib/pleroma/web/oauth/token/response.ex 0 additions, 45 deletions

lib/pleroma/web/oauth/token/response.ex
test/web/mastodon_api/controllers/account_controller_test.exs 3 additions, 3 deletions

.../web/mastodon_api/controllers/account_controller_test.exs

with 56 additions and 68 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