summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.devcontainer/Dockerfile2
-rw-r--r--.devcontainer/docker-compose.yml3
-rw-r--r--.env.test9
-rw-r--r--.github/actions/setup-ruby/action.yml2
-rw-r--r--.github/renovate.json57
-rw-r--r--.github/stylelint-matcher.json21
-rw-r--r--.github/workflows/crowdin-download.yml2
-rw-r--r--.github/workflows/lint-css.yml6
-rw-r--r--.github/workflows/test-ruby.yml38
-rw-r--r--.gitignore3
-rw-r--r--.nvmrc2
-rw-r--r--.rubocop.yml5
-rw-r--r--.rubocop_todo.yml41
-rw-r--r--.ruby-version2
-rw-r--r--.simplecov22
-rw-r--r--Dockerfile8
-rw-r--r--Gemfile29
-rw-r--r--Gemfile.lock339
-rw-r--r--README.md6
-rw-r--r--app/controllers/accounts_controller.rb2
-rw-r--r--app/controllers/activitypub/collections_controller.rb2
-rw-r--r--app/controllers/activitypub/outboxes_controller.rb2
-rw-r--r--app/controllers/admin/accounts_controller.rb2
-rw-r--r--app/controllers/admin/domain_allows_controller.rb2
-rw-r--r--app/controllers/admin/site_uploads_controller.rb2
-rw-r--r--app/controllers/api/v1/accounts/statuses_controller.rb6
-rw-r--r--app/controllers/api/v1/accounts_controller.rb30
-rw-r--r--app/controllers/api/v1/admin/domain_blocks_controller.rb9
-rw-r--r--app/controllers/api/v1/apps/credentials_controller.rb2
-rw-r--r--app/controllers/api/v1/apps_controller.rb4
-rw-r--r--app/controllers/api/v1/bookmarks_controller.rb6
-rw-r--r--app/controllers/api/v1/favourites_controller.rb6
-rw-r--r--app/controllers/api/v1/notifications/requests_controller.rb2
-rw-r--r--app/controllers/api/v1/notifications_controller.rb2
-rw-r--r--app/controllers/api/v1/push/subscriptions_controller.rb33
-rw-r--r--app/controllers/api/v1/statuses_controller.rb35
-rw-r--r--app/controllers/api/v1/timelines/home_controller.rb6
-rw-r--r--app/controllers/api/v1/timelines/list_controller.rb6
-rw-r--r--app/controllers/api/v1/timelines/public_controller.rb6
-rw-r--r--app/controllers/api/v1/timelines/tag_controller.rb6
-rw-r--r--app/controllers/api/v1/trends/statuses_controller.rb2
-rw-r--r--app/controllers/application_controller.rb1
-rw-r--r--app/controllers/auth/registrations_controller.rb2
-rw-r--r--app/controllers/concerns/cache_concern.rb16
-rw-r--r--app/controllers/concerns/preloading_concern.rb17
-rw-r--r--app/controllers/settings/applications_controller.rb2
-rw-r--r--app/controllers/tags_controller.rb2
-rw-r--r--app/controllers/well_known/oauth_metadata_controller.rb23
-rw-r--r--app/helpers/application_helper.rb16
-rw-r--r--app/helpers/mascot_helper.rb11
-rw-r--r--app/javascript/entrypoints/application.ts (renamed from app/javascript/entrypoints/application.js)4
-rw-r--r--app/javascript/entrypoints/error.ts (renamed from app/javascript/entrypoints/error.js)6
-rw-r--r--app/javascript/entrypoints/inert.ts (renamed from app/javascript/entrypoints/inert.js)0
-rw-r--r--app/javascript/entrypoints/mailer.ts (renamed from app/javascript/entrypoints/mailer.js)0
-rw-r--r--app/javascript/entrypoints/public-path.ts (renamed from app/javascript/entrypoints/public-path.js)10
-rw-r--r--app/javascript/entrypoints/share.tsx (renamed from app/javascript/entrypoints/share.jsx)16
-rw-r--r--app/javascript/entrypoints/sign_up.js42
-rw-r--r--app/javascript/entrypoints/sign_up.ts48
-rw-r--r--app/javascript/entrypoints/two_factor_authentication.js119
-rw-r--r--app/javascript/entrypoints/two_factor_authentication.ts197
-rw-r--r--app/javascript/mastodon/actions/account_notes.ts22
-rw-r--r--app/javascript/mastodon/actions/accounts.js64
-rw-r--r--app/javascript/mastodon/actions/announcements.js14
-rw-r--r--app/javascript/mastodon/actions/blocks.js6
-rw-r--r--app/javascript/mastodon/actions/bookmarks.js4
-rw-r--r--app/javascript/mastodon/actions/compose.js16
-rw-r--r--app/javascript/mastodon/actions/conversations.js10
-rw-r--r--app/javascript/mastodon/actions/custom_emojis.js4
-rw-r--r--app/javascript/mastodon/actions/directory.js6
-rw-r--r--app/javascript/mastodon/actions/domain_blocks.js10
-rw-r--r--app/javascript/mastodon/actions/favourites.js4
-rw-r--r--app/javascript/mastodon/actions/featured_tags.js2
-rw-r--r--app/javascript/mastodon/actions/filters.js12
-rw-r--r--app/javascript/mastodon/actions/history.js2
-rw-r--r--app/javascript/mastodon/actions/interactions.js122
-rw-r--r--app/javascript/mastodon/actions/interactions_typed.ts35
-rw-r--r--app/javascript/mastodon/actions/lists.js39
-rw-r--r--app/javascript/mastodon/actions/markers.ts61
-rw-r--r--app/javascript/mastodon/actions/mutes.js6
-rw-r--r--app/javascript/mastodon/actions/notifications.js32
-rw-r--r--app/javascript/mastodon/actions/pin_statuses.js4
-rw-r--r--app/javascript/mastodon/actions/polls.js8
-rw-r--r--app/javascript/mastodon/actions/reports.js4
-rw-r--r--app/javascript/mastodon/actions/search.js6
-rw-r--r--app/javascript/mastodon/actions/server.js10
-rw-r--r--app/javascript/mastodon/actions/settings.js2
-rw-r--r--app/javascript/mastodon/actions/statuses.js22
-rw-r--r--app/javascript/mastodon/actions/suggestions.js8
-rw-r--r--app/javascript/mastodon/actions/tags.js18
-rw-r--r--app/javascript/mastodon/actions/timelines.js2
-rw-r--r--app/javascript/mastodon/actions/trends.js12
-rw-r--r--app/javascript/mastodon/api.ts38
-rw-r--r--app/javascript/mastodon/api/accounts.ts7
-rw-r--r--app/javascript/mastodon/api/interactions.ts10
-rw-r--r--app/javascript/mastodon/components/account.jsx1
-rw-r--r--app/javascript/mastodon/components/admin/Counter.jsx2
-rw-r--r--app/javascript/mastodon/components/admin/Dimension.jsx2
-rw-r--r--app/javascript/mastodon/components/admin/ImpactReport.jsx2
-rw-r--r--app/javascript/mastodon/components/admin/ReportReasonSelector.jsx4
-rw-r--r--app/javascript/mastodon/components/admin/Retention.jsx2
-rw-r--r--app/javascript/mastodon/components/admin/Trends.jsx2
-rw-r--r--app/javascript/mastodon/components/badge.jsx6
-rw-r--r--app/javascript/mastodon/components/column_header.jsx12
-rw-r--r--app/javascript/mastodon/components/poll.jsx11
-rw-r--r--app/javascript/mastodon/components/status_action_bar.jsx17
-rw-r--r--app/javascript/mastodon/components/status_content.jsx12
-rw-r--r--app/javascript/mastodon/containers/mastodon.jsx54
-rw-r--r--app/javascript/mastodon/containers/status_container.jsx4
-rw-r--r--app/javascript/mastodon/features/account/components/header.jsx10
-rw-r--r--app/javascript/mastodon/features/account/containers/account_note_container.js2
-rw-r--r--app/javascript/mastodon/features/community_timeline/index.jsx