Merge branch 'master' of github.com:indentlabs/notebook

Author: drusepth

app/views/layouts/_common_head.html.erb

@@ -13,7 +13,7 @@
 <%= render 'layouts/seo' %>
 
 <%# todo: Is there a way to play nicer with thredded's jquery? %>
-<% unless request.env.fetch('REQUEST_PATH', '').start_with?('/forum') %>
+<% unless request.fullpath.start_with?('/forum') %>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-ujs/1.2.2/rails.min.js" integrity="sha256-BbyWhCn0G+F6xbWJ2pcI5LnnpsnpSzyjJNVtl7ABp+M=" crossorigin="anonymous"></script>
 <% end %>
 

lib/extensions/thredded/topic.rb

@@ -27,7 +27,7 @@ def self.text_color
       end
 
       def notify_discord
-        NotifyDiscordOfThreadJob.set(wait: 1.minute).perform_later(self.id)
+        NotifyDiscordOfThreadJob.set(wait: 1.minute).perform_later(self.id) if Rails.env.production?
       end
 
       def create_content_page_share