about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-10-21 14:47:17 -0500
committerDavid Yip <yipdw@member.fsf.org>2017-10-21 14:54:36 -0500
commit670e6a33f8eeca628707dc020e02ce32502d74a4 (patch)
tree527043ee2b85d5a18dc5c51acd7277fc560b3e78 /app/controllers/settings
parentcd04e3df58c09b0faca81ccc820b2cd5e12c2890 (diff)
Move KeywordMute into Glitch namespace.
There are two motivations for this:

1. It looks like we're going to add other features that require
   server-side storage (e.g. user notes).

2. Namespacing glitchsoc modifications is a good idea anyway: even if we
   do not end up doing (1), if upstream introduces a keyword-mute feature
   that also uses a "KeywordMute" model, we can avoid some merge
   conflicts this way and work on the more interesting task of
   choosing which implementation to use.
Diffstat (limited to 'app/controllers/settings')
-rw-r--r--app/controllers/settings/keyword_mutes_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/settings/keyword_mutes_controller.rb b/app/controllers/settings/keyword_mutes_controller.rb
index d9f99af09..6ae05108d 100644
--- a/app/controllers/settings/keyword_mutes_controller.rb
+++ b/app/controllers/settings/keyword_mutes_controller.rb
@@ -55,7 +55,7 @@ class Settings::KeywordMutesController < ApplicationController
   end
 
   def keyword_mutes_for_account
-    KeywordMute.where(account: @account)
+    Glitch::KeywordMute.where(account: @account)
   end
 
   def load_keyword_mute