You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 941a9df28a Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: Upstream changed how the nightly builds are versioned, the conflict is because glitch-soc modified adjacent lines relative to the docker repositories the images are pushed to. Applied upstream's changes. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream moved some settings around. Glitch-soc had more settings. Applied upstream's changes, moving glitch-soc's extra settings accordingly.		1 year ago
..
about	Change public accounts pages to mount the web UI (#19319)	2 years ago
accounts	Fix haml-lint Rubocop `Style/SlicingWithRange` cop (#25947)	1 year ago
admin	Consolidate inclusion of `admin` js pack link (#26628)	1 year ago
admin_mailer	Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)	1 year ago
application	Add card with who invited you to join when displaying rules on sign-up (#23475)	1 year ago
auth	Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream	1 year ago
custom_css	Add role badges to the WebUI (#25649)	1 year ago
disputes/strikes	Fix incorrect post links in strikes when the account is remote (#23611)	2 years ago
errors	Add specific rate limits for posting and following (#13172)	5 years ago
filters	Consolidate inclusion of `admin` js pack link (#26628)	1 year ago
follower_accounts	Change public accounts pages to mount the web UI (#19319)	2 years ago
following_accounts	Change public accounts pages to mount the web UI (#19319)	2 years ago
home	Change public accounts pages to mount the web UI (#19319)	2 years ago
invites	Fix haml-lint Rubocop `lambda` cop (#25946)	1 year ago
kaminari	Fix missing translation in pagination gap tags (#24262)	2 years ago
layouts	Consolidate inclusion of `admin` js pack link (#26628)	1 year ago
mail_subscriptions	Add unsubscribe link to e-mails (#25378)	1 year ago
media	Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream	1 year ago
notification_mailer	Fix haml-lint Rubocop `Style/NumericPredicate` cop (#26040)	1 year ago
oauth	Add role badges to the WebUI (#25649)	1 year ago
privacy	Change public accounts pages to mount the web UI (#19319)	2 years ago
relationships	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
remote_interaction_helper	Fix interaction modal being broken because of glitch-soc's theming system	1 year ago
settings	Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream	1 year ago
shared	Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream	1 year ago
shares	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
statuses	Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream	1 year ago
statuses_cleanup	Fix haml-lint Rubocop `lambda` cop (#25946)	1 year ago
tags	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
user_mailer	Fix ArgumentError in mailers when a user's timezone is blank (#26025)	1 year ago
well_known/host_meta	Rubocop fix: `Perfomance/UnfreezeString` (#26217)	1 year ago