155dc4bc4b
Conflicts: - `CONTRIBUTING.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `README.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `app/helpers/application_helper.rb`: Upstream added helpers where glitch-soc had extra ones. Added upstream's new helpers. - `app/models/form/admin_settings.rb`: Upstream added some custom handling of one setting, while glitch-soc had additional code. Ported upstream's code. - `lib/mastodon/version.rb`: Upstream moved some things to `config/mastodon.yml`. Did the same. - `spec/requests/api/v1/accounts/credentials_spec.rb`: I don't know honestly. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| api | ||
| auth | ||
| oauth | ||
| settings | ||
| statuses | ||
| well_known | ||
| account_show_page_spec.rb | ||
| accounts_spec.rb | ||
| anonymous_cookies_spec.rb | ||
| backups_spec.rb | ||
| cache_spec.rb | ||
| catch_all_route_request_spec.rb | ||
| content_security_policy_spec.rb | ||
| custom_css_spec.rb | ||
| disabled_oauth_endpoints_spec.rb | ||
| emojis_spec.rb | ||
| filters_spec.rb | ||
| follower_accounts_spec.rb | ||
| following_accounts_spec.rb | ||
| health_spec.rb | ||
| instance_actor_spec.rb | ||
| invite_spec.rb | ||
| invites_spec.rb | ||
| link_headers_spec.rb | ||
| localization_spec.rb | ||
| log_out_spec.rb | ||
| mail_subscriptions_spec.rb | ||
| manifest_spec.rb | ||
| media_proxy_spec.rb | ||
| media_spec.rb | ||
| omniauth_callbacks_spec.rb | ||
| remote_interaction_helper_spec.rb | ||
| self_destruct_spec.rb | ||
| severed_relationships_spec.rb | ||
| signature_verification_spec.rb | ||
| tags_spec.rb | ||