diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-09-11 16:03:17 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-09-11 16:03:17 -0600 |
| commit | b12b7243787512b3099dcb6c264c5973eb397301 (patch) | |
| tree | 13365f325bdaaa110930a5adece4a5d4fc096f7b /config | |
| parent | c7d717cf6a452afbf71158bddce78fdd29368d5b (diff) | |
| download | gitlab-ce-b12b7243787512b3099dcb6c264c5973eb397301.tar.gz | |
Remove x-json mime_type, rename to json_mime_types.rails-5-backports
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/mime_types.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index 350388fedbe..cf3917033d8 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -13,11 +13,10 @@ Mime::Type.register "video/mp4", :mp4, [], [:m4v, :mov] Mime::Type.register "video/webm", :webm Mime::Type.register "video/ogg", :ogv -lfs_mime_types = %w( +json_mime_types = %w( application/vnd.git-lfs+json - text/x-json application/json ) Mime::Type.unregister :json -Mime::Type.register 'application/json', :json, lfs_mime_types +Mime::Type.register 'application/json', :json, json_mime_types |