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

2020-04-20 16:45:40 +02:00
parent d5530827c9 f2cf912771
commit 63dc7cfa90
578 changed files with 672 additions and 446 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -100,7 +100,9 @@ Rails.application.routes.draw do
  get '/settings', to: redirect('/settings/profile')

  namespace :settings do
-    resource :profile, only: [:show, :update]
+    resource :profile, only: [:show, :update] do
+      resources :pictures, only: :destroy
+    end

    get :preferences, to: redirect('/settings/preferences/appearance')