Mastodon

Files

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

Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.

2023-06-10 16:22:14 +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-03-16 23:12:59 +01:00

action_logs

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

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

announcements

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

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

change_emails

Fix more haml-lint Rubocop (#24107 )

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

custom_emojis

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

2023-03-16 23:12:59 +01: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 commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream

2023-06-10 15:09:19 +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 '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream

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

relationships

…

relays

…

report_notes

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

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

reports

Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream

2023-05-25 20:43:25 +02:00

roles

Consistently use middle dot (·) instead of bullet (•) to separate items (#25248 )

2023-06-02 19:58:18 +02:00

rules

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

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

settings

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

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

status_edits

…

statuses

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

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