summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-09-12 14:23:32 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-09-12 14:23:32 -0600
commit8b6bbc866d78ec8d4d8a99c0862c9d4c30398d90 (patch)
tree75ada6a44f7059b2c1604a962af94fd61d01db8d /config
parentb12b7243787512b3099dcb6c264c5973eb397301 (diff)
downloadgitlab-ce-8b6bbc866d78ec8d4d8a99c0862c9d4c30398d90.tar.gz
No need for this variable.
Diffstat (limited to 'config')
-rw-r--r--config/initializers/mime_types.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index cf3917033d8..5e3e4c966cb 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -13,10 +13,5 @@ Mime::Type.register "video/mp4", :mp4, [], [:m4v, :mov]
Mime::Type.register "video/webm", :webm
Mime::Type.register "video/ogg", :ogv
-json_mime_types = %w(
- application/vnd.git-lfs+json
- application/json
-)
-
Mime::Type.unregister :json
-Mime::Type.register 'application/json', :json, json_mime_types
+Mime::Type.register 'application/json', :json, %w(application/vnd.git-lfs+json application/json)