From d74da1a89aef27ed78eb521a86b6412ef00acd0f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 2 Oct 2016 23:46:25 +0200
Subject: [PATCH] Small fixes
---
app/services/process_feed_service.rb | 3 +--
config/application.rb | 4 ++++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index fdf59b41c..1ea79835b 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -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
diff --git a/config/application.rb b/config/application.rb
index f6a5f6f9e..b1c9d9f6f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -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
--
GitLab