diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-16 12:51:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-16 12:51:30 +0200 |
| commit | 5d710b1139b34f2ed6bd556f448fa7248354e758 (patch) | |
| tree | 958a5ff315699f13b4668f190c321291df06e29c /config | |
| parent | 8a58942c80275788cbe069f2d67c396732ec092d (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
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 16 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 474de3985..325df5045 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -81,6 +81,8 @@ en: web: Web domain_block: add_new: Add new + created_msg: Domain block is now being processed + destroyed_msg: Domain block has been undone domain: Domain new: create: Create block @@ -90,8 +92,22 @@ en: silence: Silence suspend: Suspend title: New domain block + reject_media: Reject media files + reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions + severities: + silence: Silence + suspend: Suspend severity: Severity + show: + affected_accounts: + one: One account in the database affected + other: "%{count} accounts in the database affected" + retroactive: + silence: Unsilence all existing accounts from this domain + suspend: Unsuspend all existing accounts from this domain + title: Undo domain block for %{domain} title: Domain Blocks + undo: Undo pubsubhubbub: callback_url: Callback URL confirmed: Confirmed diff --git a/config/routes.rb b/config/routes.rb index 31909a4f4..fd186c320 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -78,7 +78,7 @@ Rails.application.routes.draw do namespace :admin do resources :pubsubhubbub, only: [:index] - resources :domain_blocks, only: [:index, :new, :create] + resources :domain_blocks, only: [:index, :new, :create, :show, :destroy] resources :settings, only: [:index, :update] resources :reports, only: [:index, :show, :update] do |