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

Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.

1 files changed, 1 insertions, 1 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 49edb4602..545c07255 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -233,7 +233,7 @@ Rails.application.routes.draw do
         end
       end
 
-      resource :role do
+      resource :role, only: [] do
         member do
           post :promote
           post :demote