gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'parent/main' into upstream-20241231

Browse source
This commit is contained in:
KMY 2024-12-31 11:56:36 +09:00
commit 3c77d4e8e4
268 changed files with 4213 additions and 3029 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v1/polls/votes_controller.rb
View file

@ -15,7 +15,7 @@ class Api::V1::Polls::VotesController < Api::BaseController
private
def set_poll
@poll = Poll.attached.find(params[:poll_id])
@poll = Poll.find(params[:poll_id])
authorize @poll.status, :show?
rescue Mastodon::NotPermittedError
not_found

2
app/controllers/api/v1/polls_controller.rb
View file

@ -15,7 +15,7 @@ class Api::V1::PollsController < Api::BaseController
private
def set_poll
@poll = Poll.attached.find(params[:id])
@poll = Poll.find(params[:id])
authorize @poll.status, :show?
rescue Mastodon::NotPermittedError
not_found