From b0d2e69cc39e35b76d946258f2de95760ee544a3 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Fri, 12 Feb 2016 15:18:34 +0800
Subject: [PATCH 1/2] FIX: Update log level to warn.
---
.../connection_adapters/postgresql_fallback_adapter.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
index b1f88e372..980dfafa0 100644
--- a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
+++ b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
@@ -22,12 +22,12 @@ class PostgreSQLFallbackHandler
Thread.new do
begin
- logger.info "#{self.class}: Checking master server..."
+ logger.warn "#{self.class}: Checking master server..."
connection = ActiveRecord::Base.postgresql_connection(config)
if connection.active?
connection.disconnect!
- logger.info "#{self.class}: Master server is active. Reconnecting..."
+ logger.warn "#{self.class}: Master server is active. Reconnecting..."
ActiveRecord::Base.establish_connection(config)
Discourse.disable_readonly_mode
@master = true
From 6478f5defafd1e54c265e29f8a18aefebfbb5611 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Fri, 12 Feb 2016 18:20:22 +1100
Subject: [PATCH 2/2] UX: envelope glyph for suggested PMs
---
app/assets/javascripts/discourse/templates/topic.hbs | 2 +-
app/assets/javascripts/discourse/views/topic.js.es6 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 93358cf1b..a0b211efd 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -110,7 +110,7 @@
{{#if model.details.suggested_topics.length}}
<div id="suggested-topics">
- <h3>{{unbound view.suggestedTitle}}</h3>
+ <h3>{{{unbound view.suggestedTitle}}}</h3>
<div class="topics">
{{#if model.isPrivateMessage}}
{{basic-topic-list
diff --git a/app/assets/javascripts/discourse/views/topic.js.es6 b/app/assets/javascripts/discourse/views/topic.js.es6
index 89340de6c..58939896b 100644
--- a/app/assets/javascripts/discourse/views/topic.js.es6
+++ b/app/assets/javascripts/discourse/views/topic.js.es6
@@ -167,7 +167,7 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli
suggestedTitle: function(){
return this.get('controller.model.isPrivateMessage') ?
- I18n.t("suggested_topics.pm_title") :
+ "<i class='private-message-glyph fa fa-envelope'></i> " + I18n.t("suggested_topics.pm_title") :
I18n.t("suggested_topics.title");
}.property()
});