Skip to content
Snippets Groups Projects
Commit d74da1a8 authored by Eugen Rochko's avatar Eugen Rochko
Browse files

Small fixes

parent f06f2958
No related branches found
No related tags found
No related merge requests found
......@@ -153,9 +153,8 @@ class ProcessFeedService < BaseService
status = Status.new(account: account, uri: target_id(xml), text: target_content(xml), url: target_url(xml), created_at: published(xml), updated_at: updated(xml))
status.thread = find_original_status(xml, thread_id(xml))
status.save
if status.saved? && status.thread.nil? && !thread_href(xml).nil?
if status.save && status.thread.nil? && !thread_href(xml).nil?
ThreadResolveWorker.perform_async(status.id, thread_href(xml))
end
......
......@@ -31,5 +31,9 @@ module Mastodon
config.middleware.use Rack::Deflater
config.browserify_rails.commandline_options = "--transform [ babelify --presets [ es2015 react ] ] --extension=\".jsx\""
config.to_prepare do
Doorkeeper::AuthorizationsController.layout 'auth'
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment