FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views/admin
History
Claire 2d09653d50 Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb:
  Upstream added an `include` where we had an extra `include` due to
  glitch-soc's theming system.
  Added upstream's new `include`.
 		2023-07-13 13:35:15 +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 branch 'main' into glitch-soc/merge-upstream 2023-06-27 13:15:41 +02:00
email_domain_blocks Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
export_domain_allows
…
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
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