tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
e3682c9c17
mastodon/app/views/admin/domain_blocks
History
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
..
_domain_block.html.haml Add option to block reports from domain (#8830) 2018-10-20 08:02:44 +02:00
index.html.haml Add option to block reports from domain (#8830) 2018-10-20 08:02:44 +02:00
new.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
show.html.haml Allow domain blocks that only reject media without silencing or suspending (#4325) 2017-07-24 14:26:55 +02:00