treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/app/views/admin
History
Claire 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
 		2023-07-30 16:11:55 +02:00
..
account_actions Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
account_warnings Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
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 '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream 2023-07-30 16:11:55 +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 Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
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 Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
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 Add ability to view previous edits of a status in admin UI (#19462) 2022-10-26 13:42:29 +02:00
statuses Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
tags Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
trends Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream 2023-07-13 13:35:15 +02:00
users/roles Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
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