diff --git a/.discourse-compatibility b/.discourse-compatibility new file mode 100644 index 00000000..0b4de0ee --- /dev/null +++ b/.discourse-compatibility @@ -0,0 +1 @@ +2.6.0.beta1: bb85b3a0d2c0ab6b59bcb405731c39089ec6731c \ No newline at end of file diff --git a/assets/javascripts/wizard-custom.js b/assets/javascripts/wizard-custom.js index cef27152..89bc06ef 100644 --- a/assets/javascripts/wizard-custom.js +++ b/assets/javascripts/wizard-custom.js @@ -19,9 +19,8 @@ //= require discourse/app/lib/formatter //= require discourse/app/lib/quote //= require discourse/app/lib/link-mentions -//= require discourse/app/lib/link-category-hashtags +//= require discourse/app/lib/link-hashtags //= require discourse/app/lib/category-hashtags -//= require discourse/app/lib/link-tag-hashtag //= require discourse/app/lib/tag-hashtags //= require discourse/app/lib/uploads //= require discourse/app/lib/category-tag-search diff --git a/assets/javascripts/wizard-raw-templates.js.erb b/assets/javascripts/wizard-raw-templates.js.erb index 3556dc45..b6a5b7f7 100644 --- a/assets/javascripts/wizard-raw-templates.js.erb +++ b/assets/javascripts/wizard-raw-templates.js.erb @@ -21,7 +21,7 @@ Discourse.unofficial_plugins.each do |plugin| result << " (function() { if ('Wizard' in window) { - Discourse.RAW_TEMPLATES['javascripts/#{name}'] = requirejs('discourse-common/lib/raw-handlebars').template(#{compiled}); + window.__DISCOURSE_RAW_TEMPLATES['javascripts/#{name}'] = requirejs('discourse-common/lib/raw-handlebars').template(#{compiled}); } })(); "