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

aa8a6e7b

Commit aa8a6e7b authored 5 years ago by lain

Downloads
- Plain Diff

Merge branch 'refactor/oauth_scopes' into 'develop'

Refactoring functions for dealing with oauth scopes.

See merge request pleroma/pleroma!1125

parents 14deed7f 799e1f48

Branches

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/controller_helper.ex 0 additions, 6 deletions

lib/pleroma/web/controller_helper.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 2 additions, 1 deletion

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/oauth.ex 0 additions, 14 deletions

lib/pleroma/web/oauth.ex
lib/pleroma/web/oauth/oauth_controller.ex 17 additions, 14 deletions

lib/pleroma/web/oauth/oauth_controller.ex
lib/pleroma/web/oauth/scopes.ex 67 additions, 0 deletions

lib/pleroma/web/oauth/scopes.ex

with 86 additions and 35 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