tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to Rails 5.0.0.1

Browse Source
This commit is contained in:
Eugen Rochko
2016-08-17 17:56:23 +02:00
parent ff2cbc0753
commit 10ba09f546
47 changed files with 398 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/salmon_controller.rb
View File

@ -4,7 +4,7 @@ class Api::SalmonController < ApiController
def update
ProcessInteractionService.new.(request.body.read, @account)
render nothing: true, status: 201
head 201
end
private

8
app/controllers/api/subscriptions_controller.rb
View File

@ -4,9 +4,9 @@ class Api::SubscriptionsController < ApiController
def show
if @account.subscription(api_subscription_url(@account.id)).valid?(params['hub.topic'], params['hub.verify_token'])
render text: HTMLEntities.new.encode(params['hub.challenge']), status: 200
render plain: HTMLEntities.new.encode(params['hub.challenge']), status: 200
else
render nothing: true, status: 404
head 404
end
end
@ -15,9 +15,9 @@ class Api::SubscriptionsController < ApiController
if @account.subscription(api_subscription_url(@account.id)).verify(body, request.headers['HTTP_X_HUB_SIGNATURE'])
ProcessFeedService.new.(body, @account)
render nothing: true, status: 201
head 201
else
render nothing: true, status: 202
head 202
end
end