From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 29 Sep 2017 01:03:03 +0000 (+0200)
Subject: Remove dependency on db during assets:precompile (#5138)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5b45c1646aa324d2eb4a3ecb8c12ed4df3cdf129;p=mastodon.git

Remove dependency on db during assets:precompile (#5138)
---

diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index 31f322096..7d014dff4 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -3,7 +3,7 @@
   %head
     %meta{ content: 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type' }/
     %meta{ charset: 'utf-8' }/
-    %title= safe_join([yield(:page_title), title], ' - ')
+    %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
     %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
     = stylesheet_pack_tag 'common', media: 'all'
     = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all'