projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/notifsettings-breaking-login' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
scheduled_activity_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/controllers/scheduled_activity_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/scheduled_activity_controller.ex
index 97d2fea23b3ea15ae8bde5a765c7fa4348a0f15f..3b7a0c788d7ca92cbee1e6cc2cc44a266e0c6ee5 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/scheduled_activity_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/scheduled_activity_controller.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ScheduledActivityController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ScheduledActivityController do
@@
-7,9
+7,9
@@
defmodule Pleroma.Web.MastodonAPI.ScheduledActivityController do
import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2]
import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2]
- alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.ScheduledActivity
alias Pleroma.Web.MastodonAPI.MastodonAPI
alias Pleroma.ScheduledActivity
alias Pleroma.Web.MastodonAPI.MastodonAPI
+ alias Pleroma.Web.Plugs.OAuthScopesPlug
@oauth_read_actions [:show, :index]
@oauth_read_actions [:show, :index]