Skip to content

Commit

Permalink
Merge pull request #25043 from code-dot-org/media_proxy_allow_audio_mp3
Browse files Browse the repository at this point in the history
add audio/mp3 to media proxy content types
  • Loading branch information
cpirich committed Sep 26, 2018
2 parents 7fcc454 + b6b6ed5 commit 8f182ef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions dashboard/app/controllers/media_proxy_controller.rb
Expand Up @@ -26,6 +26,7 @@ class MediaProxyController < ApplicationController
'audio/basic',
'audio/mid',
'audio/mpeg',
'audio/mp3',
'audio/mp4',
'audio/ogg',
'audio/vnd.wav'
Expand Down
2 changes: 1 addition & 1 deletion dashboard/test/controllers/media_proxy_controller_test.rb
Expand Up @@ -10,7 +10,7 @@ class MediaProxyControllerTest < ActionController::TestCase
content_types = [
'image/bmp', 'image/x-windows-bmp', 'image/gif', 'image/jpeg',
'image/png', 'image/svg+xml', 'audio/basic', 'audio/mid', 'audio/mpeg',
'audio/mp4', 'audio/ogg', 'audio/vnd.wav'
'audio/mp3', 'audio/mp4', 'audio/ogg', 'audio/vnd.wav'
]

content_types.each do |content_type|
Expand Down

0 comments on commit 8f182ef

Please sign in to comment.