mastodon/app/views
Claire d77fbbed73 Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
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.
2023-05-08 19:28:21 +02:00
..
about Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
accounts Enable Rubocop for app/views (#23874) 2023-03-05 00:33:52 +01:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2023-03-16 23:12:59 +01:00
admin_mailer Add support for language preferences for trending statuses and links (#18288) 2022-10-08 16:45:40 +02:00
application Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
auth Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
authorize_interactions Fix links to the Web UI in notifications (#19981) 2022-11-07 15:42:58 +01:00
custom_css Fix badge color not affected (#18826) 2022-07-19 01:06:11 +02:00
disputes/strikes Fix incorrect post links in strikes when the account is remote (#23611) 2023-03-15 04:14:47 +01:00
errors
filters Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
follower_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
following_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
home Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
invites
kaminari Fix missing translation in pagination gap tags (#24262) 2023-03-29 13:54:33 +02:00
layouts Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
media Fix glitch-soc HAML linting issues (#2166) 2023-04-07 20:55:28 +02:00
notification_mailer Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
oauth Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
privacy Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
relationships Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
settings Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
shared Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
shares
statuses Merge branch 'main' into glitch-soc/merge-upstream 2023-03-16 23:12:59 +01:00
statuses_cleanup
tags Enable Rubocop for app/views (#23874) 2023-03-05 00:33:52 +01:00
user_mailer Change user backups to use expiring URLs for download when possible (#24136) 2023-03-16 22:46:52 +01:00
well_known/host_meta Enable Rubocop for app/views (#23874) 2023-03-05 00:33:52 +01:00