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

2019-02-19 20:18:40 +01:00
parent 896beb16c5 8e7fc7ec73
commit ff0576cc2b
15 changed files with 120 additions and 41 deletions
--- a/app/controllers/admin/instances_controller.rb
+++ b/app/controllers/admin/instances_controller.rb
@ -38,7 +38,7 @@ module Admin
    end

    def filter_params
-      params.permit(:limited)
+      params.permit(:limited, :by_domain)
    end
  end
 end