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

Revert "Merge branch 'master' of https://github.com/discourse/discourse"

Browse Source 
This reverts commit e62a85cf6f, reversing
changes made to 2660c2e21d.
This commit is contained in:
Jeff Atwood
2020-05-22 20:25:56 -07:00
parent e62a85cf6f
commit 20780a1eee
236 changed files with 717 additions and 1033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/application.rb
View File

@@ -27,10 +27,6 @@ require_relative '../lib/discourse_plugin_registry'
require_relative '../lib/plugin_gem'
if ENV['RAILS_FAILOVER']
require 'rails_failover'
end
# Global config
require_relative '../app/models/global_setting'
GlobalSetting.configure!
@@ -254,7 +250,7 @@ module Discourse
# Our templates shouldn't start with 'discourse/app/templates'
config.handlebars.templates_root = {
'discourse/app/templates' => '',
'select-kit/addon/templates' => 'select-kit/templates/'
'select-kit/app/templates' => 'select-kit/templates/'
}
config.handlebars.raw_template_namespace = "__DISCOURSE_RAW_TEMPLATES"