Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.
This commit is contained in:
@ -463,6 +463,7 @@ Rails.application.routes.draw do
|
||||
member do
|
||||
post :follow
|
||||
post :unfollow
|
||||
post :remove_from_followers
|
||||
post :block
|
||||
post :unblock
|
||||
post :mute
|
||||
|
Reference in New Issue
Block a user