mastodon/app/views/admin/reports
Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just a glitch-soc-only dependency too close to a
  dependency that got updated upstream. Updated as well.
- `app/models/status.rb`:
  Not a real conflict, just a change too close to glitch-soc-changed code
  for optionally showing boosts in public timelines.
  Applied upstream changes.
- `app/views/layouts/application.html.haml`:
  Upstream a new, static CSS file, conflict due to glitch-soc's theming
  system, include the file regardless of the theme.
- `config/initializers/content_security_policy.rb`:
  Upstream dropped 'unsafe-inline' from the 'style-src' directive, but
  both files are very different. Removed 'unsafe-inline' as well.
2020-05-10 16:19:56 +02:00
..
_action_log.html.haml Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
_status.html.haml Fix admin interface crashing when listing boosts with non-video media attachments (#12907) 2020-01-20 17:39:14 +01:00
index.html.haml Fix use of inline CSS in public pages (#13576) 2020-05-03 22:04:18 +02:00
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00