]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8a58942) | patch
Make file attachment on MediaAttachment optional (#1865)
authorEugen <eugen@zeonfederated.com>
Sun, 16 Apr 2017 10:51:30 +0000 (12:51 +0200)
committerGitHub <noreply@github.com>
Sun, 16 Apr 2017 10:51:30 +0000 (12:51 +0200)
commit5d710b1139b34f2ed6bd556f448fa7248354e758
tree958a5ff315699f13b4668f190c321291df06e29ctree | snapshot
parent8a58942c80275788cbe069f2d67c396732ec092dcommit | diff
Make file attachment on MediaAttachment optional (#1865)

Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true
Clean up old media files when creating a new domain block with reject_media set to true
Return remote_url in media attachments API if local file is not present
Undo domain block action in admin UI
Ability to enable reject_media from admin UI
14 files changed:
app/controllers/admin/domain_blocks_controller.rb diff | blob | history
app/controllers/application_controller.rb diff | blob | history
app/models/domain_block.rb diff | blob | history
app/services/block_domain_service.rb diff | blob | history
app/services/process_feed_service.rb diff | blob | history
app/services/suspend_account_service.rb diff | blob | history
app/services/unblock_domain_service.rb [new file with mode: 0644] blob
app/views/admin/domain_blocks/index.html.haml diff | blob | history
app/views/admin/domain_blocks/new.html.haml diff | blob | history
app/views/admin/domain_blocks/show.html.haml [new file with mode: 0644] blob
app/views/api/v1/statuses/_media.rabl diff | blob | history
config/locales/en.yml diff | blob | history
config/routes.rb diff | blob | history
spec/views/stream_entries/show.html.haml_spec.rb diff | blob | history
source code fur Kibicat Mastodon