Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-21 14:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2024-11-10 13:18:43 +01:00
parent bf454e9956 1e71c4e247
commit f0f807cec7
158 changed files with 2872 additions and 936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/routes/admin.rb
View File

@@ -40,8 +40,10 @@ namespace :admin do
end
end
get '/settings', to: redirect('/admin/settings/branding')
get '/settings/edit', to: redirect('/admin/settings/branding')
with_options to: redirect('/admin/settings/branding') do
get '/settings'
get '/settings/edit'
end
namespace :settings do
resource :branding, only: [:show, :update], controller: 'branding'