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

Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
This commit is contained in:
Claire
2024-12-25 18:01:37 +01:00
parent 57c5905c19 8770905186
commit 0aa69487a2
759 changed files with 13447 additions and 7221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/routes/admin.rb
View File

@@ -33,6 +33,18 @@ namespace :admin do
resources :action_logs, only: [:index]
resources :warning_presets, except: [:new, :show]
namespace :terms_of_service do
resource :generate, only: [:show, :create]
resource :history, only: [:show]
resource :draft, only: [:show, :update]
end
resources :terms_of_service, only: [:index] do
resource :preview, only: [:show], module: :terms_of_service
resource :test, only: [:create], module: :terms_of_service
resource :distribution, only: [:create], module: :terms_of_service
end
resources :announcements, except: [:show] do
member do
post :publish