IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into vdom

Browse Source
This commit is contained in:
Sam 2016-02-12 18:21:03 +11:00
commit f02e035f94
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/topic.hbs
View File

@ -134,7 +134,7 @@
{{#if model.details.suggested_topics.length}} {{#if model.details.suggested_topics.length}}
<div id="suggested-topics"> <div id="suggested-topics">
<h3>{{unbound view.suggestedTitle}}</h3> <h3>{{{unbound view.suggestedTitle}}}</h3>
<div class="topics"> <div class="topics">
{{#if model.isPrivateMessage}} {{#if model.isPrivateMessage}}
{{basic-topic-list {{basic-topic-list

2
app/assets/javascripts/discourse/views/topic.js.es6
View File

@ -167,7 +167,7 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli
suggestedTitle: function(){ suggestedTitle: function(){
return this.get('controller.model.isPrivateMessage') ? 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"); I18n.t("suggested_topics.title");
}.property() }.property()
}); });

4
lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
View File

@ -22,12 +22,12 @@ class PostgreSQLFallbackHandler
Thread.new do Thread.new do
begin begin
logger.info "#{self.class}: Checking master server..." logger.warn "#{self.class}: Checking master server..."
connection = ActiveRecord::Base.postgresql_connection(config) connection = ActiveRecord::Base.postgresql_connection(config)
if connection.active? if connection.active?
connection.disconnect! 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) ActiveRecord::Base.establish_connection(config)
Discourse.disable_readonly_mode Discourse.disable_readonly_mode
@master = true @master = true