Claire b2515feb29 Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream

2023-07-30 14:33:28 +02:00

..

account_actions

Fix more haml-lint Rubocop (#24107)

2023-03-15 20:07:43 +01:00

account_warnings

…

accounts

Merge branch 'main' into glitch-soc/merge-upstream

2023-07-19 07:35:51 +02:00

action_logs

Merge branch 'main' into glitch-soc/merge-upstream

2023-03-16 23:12:59 +01:00

announcements

Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream

2023-07-30 14:33:28 +02:00

change_emails

Fix more haml-lint Rubocop (#24107)

2023-03-15 20:07:43 +01:00

custom_emojis

Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream

2023-07-30 14:33:28 +02:00

dashboard

Merge branch 'main' into glitch-soc/merge-upstream

2023-03-16 23:12:59 +01:00

disputes/appeals

Merge branch 'main' into glitch-soc/merge-upstream

2023-03-15 09:16:10 +01:00

domain_allows

…

domain_blocks

Merge branch 'main' into glitch-soc/merge-upstream

2023-07-17 19:02:23 +02:00

email_domain_blocks

Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream

2023-06-10 16:22:14 +02:00

export_domain_allows

Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)

2022-11-17 11:05:09 +01:00

export_domain_blocks

Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream

2023-06-10 16:22:14 +02:00

follow_recommendations

…

instances

Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream

2023-06-10 16:22:14 +02:00

invites

…

ip_blocks

Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream

2023-07-30 14:33:28 +02:00

relationships

…

relays

Update haml-lint 0.49.1 (#26118)

2023-07-23 17:48:16 +02:00

report_notes

Change account moderation notes to make links clickable (#22553)

2023-01-18 16:32:23 +01:00

reports

Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream

2023-07-30 13:15:01 +02:00

roles

Update haml-lint 0.49.1 (#26118)

2023-07-23 17:48:16 +02:00

rules

Setup haml-lint CI with todo config (#23524)

2023-03-15 04:15:36 +01:00

settings

Merge branch 'main' into glitch-soc/merge-upstream

2023-07-19 07:35:51 +02:00

status_edits

…

statuses

Merge branch 'main' into glitch-soc/merge-upstream

2023-03-05 20:46:56 +01:00

tags

…

trends

Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream

2023-07-13 13:35:15 +02:00

users/roles

…

warning_presets

Setup haml-lint CI with todo config (#23524)

2023-03-15 04:15:36 +01:00

webhooks

Add finer permission requirements for managing webhooks (#25463)

2023-06-22 14:52:25 +02:00