Skip to content
Extraits de code Groupes Projets
Valider d74da1a8 rédigé par Eugen Rochko's avatar Eugen Rochko
Parcourir les fichiers

Small fixes

parent f06f2958
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -153,9 +153,8 @@ class ProcessFeedService < BaseService ...@@ -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 = 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.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)) ThreadResolveWorker.perform_async(status.id, thread_href(xml))
end end
......
...@@ -31,5 +31,9 @@ module Mastodon ...@@ -31,5 +31,9 @@ module Mastodon
config.middleware.use Rack::Deflater config.middleware.use Rack::Deflater
config.browserify_rails.commandline_options = "--transform [ babelify --presets [ es2015 react ] ] --extension=\".jsx\"" config.browserify_rails.commandline_options = "--transform [ babelify --presets [ es2015 react ] ] --extension=\".jsx\""
config.to_prepare do
Doorkeeper::AuthorizationsController.layout 'auth'
end
end end
end end
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter