diff options
| author | lambda <lain@soykaf.club> | 2019-03-13 09:09:44 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-03-13 09:09:44 +0000 |
| commit | 92a0210fb03ca3e0aefe769fb6b0ab7bda6e5336 (patch) | |
| tree | 56e78105e29834c60f73c1bf8c39a983d88421a4 /lib/pleroma/web/controller_helper.ex | |
| parent | d0e94d5f1baac7a19d6cdd33b1f54470041e7227 (diff) | |
| parent | d43b1c0b5d203fd4f195951ac7b60b666a43914f (diff) | |
| download | pleroma-92a0210fb03ca3e0aefe769fb6b0ab7bda6e5336.tar.gz | |
Merge branch 'features/add-credo-to-ci' into 'develop'
Add credo to CI
See merge request pleroma/pleroma!902
Diffstat (limited to 'lib/pleroma/web/controller_helper.ex')
| -rw-r--r-- | lib/pleroma/web/controller_helper.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex index 5915ea40e..4d6192db0 100644 --- a/lib/pleroma/web/controller_helper.ex +++ b/lib/pleroma/web/controller_helper.ex @@ -6,7 +6,8 @@ defmodule Pleroma.Web.ControllerHelper do use Pleroma.Web, :controller def oauth_scopes(params, default) do - # Note: `scopes` is used by Mastodon — supporting it but sticking to OAuth's standard `scope` wherever we control it + # Note: `scopes` is used by Mastodon — supporting it but sticking to + # OAuth's standard `scope` wherever we control it Pleroma.Web.OAuth.parse_scopes(params["scope"] || params["scopes"], default) end |