Merge branch 'master' into glitch-soc/merge-upstream

2018-07-12 19:26:20 +02:00
parent 57f31b361f 401559c376
commit ddfcedcfe4
3 changed files with 5 additions and 1 deletions
--- a/app/controllers/filters_controller.rb
+++ b/app/controllers/filters_controller.rb
@ -57,6 +57,6 @@ class FiltersController < ApplicationController
  end

  def resource_params
-    params.require(:custom_filter).permit(:phrase, :expires_in, :irreversible, context: [])
+    params.require(:custom_filter).permit(:phrase, :expires_in, :irreversible, :whole_word, context: [])
  end
 end