Merge branch 'master' into create_category_and_create_group_actions

.discourse-compatibility

@@ -0,0 +1 @@
+2.6.0.beta1: bb85b3a0d2c0ab6b59bcb405731c39089ec6731c

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

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});
           }
         })();
       "