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

091baf93

Commit 091baf93 authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'

MastoAPI 2.6.0 `force_login` option

Closes #734

See merge request pleroma/pleroma!999

parents 26d509cc 15ce7104

Branches

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

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

lib/pleroma/web/controller_helper.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 11 additions, 3 deletions

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/oauth/oauth_controller.ex 29 additions, 8 deletions

lib/pleroma/web/oauth/oauth_controller.ex
lib/pleroma/web/router.ex 10 additions, 5 deletions

lib/pleroma/web/router.ex
test/support/factory.ex 1 addition, 1 deletion

test/support/factory.ex
test/web/oauth/oauth_controller_test.exs 296 additions, 218 deletions

test/web/oauth/oauth_controller_test.exs

with 352 additions and 235 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