catstodon/app/views
Jeremy Kescher 2cb88f5baa
Merge remote-tracking branch 'upstream/main' into develop
Conflicts:
- .github/workflows/build-image.yml
  We don't use GitHub Actions for building Docker images.
- Gemfile.lock
  Versions were upgraded upstream that conflicted with our changes, simply applied upstream changes.
2023-03-19 01:57:28 +01: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-03-18 11:21:03 +01: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 Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
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 Remove invite comments from UI (#12068) 2019-10-03 22:37:13 +02:00
kaminari Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
layouts Merge branch 'main' into glitch-soc/merge-upstream 2023-03-16 23:12:59 +01:00
media Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +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 remote-tracking branch 'upstream/main' into develop 2023-03-19 01:57:28 +01:00
shared Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
shares Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
statuses Merge branch 'main' into glitch-soc/merge-upstream 2023-03-16 23:12:59 +01:00
statuses_cleanup Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
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