tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Claire
2023-07-30 13:15:01 +02:00
parent 3a14104411 1e3b19230a
commit 993d0a9950
118 changed files with 236 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/reports/index.html.haml
View File

@@ -27,7 +27,7 @@
%button.button= t('admin.accounts.search')
= link_to t('admin.accounts.reset'), admin_reports_path, class: 'button negative'
- @reports.group_by(&:target_account_id).each do |target_account_id, reports|
- @reports.group_by(&:target_account_id).each do |_target_account_id, reports|
- target_account = reports.first.target_account
.report-card
.report-card__profile