luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 20:03:24 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin/reports
History
Claire 993d0a9950 Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
2023-07-30 13:15:01 +02:00
..
actions Fix haml-lint rubocop style negation cops (#26057) 2023-07-18 17:02:02 +02:00
_actions.html.haml
_media_attachments.html.haml
_status.html.haml
index.html.haml Fix haml-lint Rubocop Lint/UnusedBlockArguments cop (#26039) 2023-07-20 17:03:39 +02:00
show.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2023-07-19 07:35:51 +02:00