mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-28 04:49:11 +00:00
d77fbbed73
Conflicts: - `.github/dependabot.yml`: Upstream made changes, but we had removed it. Discarded upstream changes. - `.rubocop_todo.yml`: Upstream regenerated the file, we had some glitch-soc-specific ignores. - `app/models/account_statuses_filter.rb`: Minor upstream code style change where glitch-soc had slightly different code due to handling of local-only posts. Updated to match upstream's code style. - `app/models/status.rb`: Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one. Moved the definitions as upstream did. - `app/services/backup_service.rb`: Upstream rewrote a lot of the backup service, glitch-soc had changes because of exporting local-only posts. Took upstream changes and added back code to deal with local-only posts. - `config/routes.rb`: Upstream split the file into different files, while glitch-soc had a few extra routes. Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb` and `config/routes/admin.rb` - `db/schema.rb`: Upstream has new migrations, while glitch-soc had an extra migration. Updated the expected serial number to match upstream's. - `lib/mastodon/version.rb`: Upstream added support to set version tags from environment variables, while glitch-soc has an extra `+glitch` tag. Changed the code to support upstream's feature but prepending a `+glitch`. - `spec/lib/activitypub/activity/create_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests due to `directMessage` handling. Applied upstream's changes while keeping glitch-soc's extra tests. - `spec/models/concerns/account_interactions_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests. Applied upstream's changes while keeping glitch-soc's extra tests.
75 lines
2.2 KiB
Ruby
75 lines
2.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
namespace :settings do
|
|
resource :profile, only: [:show, :update] do
|
|
resources :pictures, only: :destroy
|
|
end
|
|
|
|
get :preferences, to: redirect('/settings/preferences/appearance')
|
|
|
|
namespace :preferences do
|
|
resource :appearance, only: [:show, :update], controller: :appearance
|
|
resource :notifications, only: [:show, :update]
|
|
resource :other, only: [:show, :update], controller: :other
|
|
end
|
|
|
|
resources :imports, only: [:index, :show, :destroy, :create] do
|
|
member do
|
|
post :confirm
|
|
get :failures
|
|
end
|
|
end
|
|
|
|
resource :export, only: [:show, :create]
|
|
|
|
namespace :exports, constraints: { format: :csv } do
|
|
resources :follows, only: :index, controller: :following_accounts
|
|
resources :blocks, only: :index, controller: :blocked_accounts
|
|
resources :mutes, only: :index, controller: :muted_accounts
|
|
resources :lists, only: :index, controller: :lists
|
|
resources :domain_blocks, only: :index, controller: :blocked_domains
|
|
resources :bookmarks, only: :index, controller: :bookmarks
|
|
end
|
|
|
|
resources :two_factor_authentication_methods, only: [:index] do
|
|
collection do
|
|
post :disable
|
|
end
|
|
end
|
|
|
|
resource :otp_authentication, only: [:show, :create], controller: 'two_factor_authentication/otp_authentication'
|
|
|
|
resources :webauthn_credentials, only: [:index, :new, :create, :destroy],
|
|
path: 'security_keys',
|
|
controller: 'two_factor_authentication/webauthn_credentials' do
|
|
collection do
|
|
get :options
|
|
end
|
|
end
|
|
|
|
namespace :two_factor_authentication do
|
|
resources :recovery_codes, only: [:create]
|
|
resource :confirmation, only: [:new, :create]
|
|
end
|
|
|
|
resources :applications, except: [:edit] do
|
|
member do
|
|
post :regenerate
|
|
end
|
|
end
|
|
|
|
resources :flavours, only: [:index, :show, :update], param: :flavour
|
|
|
|
resource :delete, only: [:show, :destroy]
|
|
resource :migration, only: [:show, :create]
|
|
|
|
namespace :migration do
|
|
resource :redirect, only: [:new, :create, :destroy]
|
|
end
|
|
|
|
resources :aliases, only: [:index, :create, :destroy]
|
|
resources :sessions, only: [:destroy]
|
|
resources :featured_tags, only: [:index, :create, :destroy]
|
|
resources :login_activities, only: [:index]
|
|
end
|