moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes after rebase

This commit is contained in:
Alexander Strizhakov 2020-08-16 20:28:31 +03:00
parent 7f82f18664
commit 1d0e130cb3
No known key found for this signature in database
GPG Key ID: 022896A53AEF1381
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
View File

@ -26,7 +26,6 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
alias Pleroma.Web.MastodonAPI.StatusView alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.OAuth.OAuthController alias Pleroma.Web.OAuth.OAuthController
alias Pleroma.Web.OAuth.OAuthView alias Pleroma.Web.OAuth.OAuthView
alias Pleroma.Web.OAuth.Token
alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug
alias Pleroma.Web.Plugs.OAuthScopesPlug alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Web.Plugs.RateLimiter alias Pleroma.Web.Plugs.RateLimiter

2
lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
View File

@ -24,7 +24,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiPackController do
@skip_plugs [ @skip_plugs [
Pleroma.Web.Plugs.OAuthScopesPlug, Pleroma.Web.Plugs.OAuthScopesPlug,
Pleroma.Web.Plugs.ExpectPublicOrAuthenticatedCheckPlug Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug
] ]
plug(:skip_plug, @skip_plugs when action in [:index, :archive, :show]) plug(:skip_plug, @skip_plugs when action in [:index, :archive, :show])

4
lib/pleroma/web/plugs/admin_secret_authentication_plug.ex
View File

@ -5,9 +5,9 @@
defmodule Pleroma.Web.Plugs.AdminSecretAuthenticationPlug do defmodule Pleroma.Web.Plugs.AdminSecretAuthenticationPlug do
import Plug.Conn import Plug.Conn
alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.Plugs.RateLimiter
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Web.Plugs.RateLimiter
def init(options) do def init(options) do
options options