Merge pull request #111 from mime-types/mime-types-3

mime-types 3.0
mime-types · Nov 21, 2015 · b6413b2 · b6413b2
2 parents 5c7f7de + 026ceea
commit b6413b2
Show file tree

Hide file tree

Showing 70 changed files with 1,574 additions and 50,166 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,5 @@ pkg
 publish
 test/cache.tst
 tmp/
+.rubocop.yml
+.byebug_history
diff --git a/.hoerc b/.hoerc
@@ -2,19 +2,19 @@
 exclude: !ruby/regexp '/
   \.(tmp|swp)$
   |
-  CVS/
+  (CVS|tmp)\/
   |
   (?i:TAGS)
   |
   \.(svn|git|hg|DS_Store|idea|vagrant)\/
   |
   Gemfile(?:\.lock)?
   |
-  type-lists\/
-  |
-  \.(coveralls|pullreview|travis).yml$
+  \.(rubocop|coveralls|pullreview|travis).yml$
   |
   \.gemspec
   |
+  \.byebug_history
+  |
   Vagrantfile
   /x'
diff --git a/.travis.yml b/.travis.yml
@@ -4,10 +4,7 @@ rvm:
   - 2.2.3
   - 2.1.6
   - 2.0.0
-  - 1.9.3
-  - jruby-1.7
   - jruby-9.0.0.0.pre2
-  - jruby-19mode
   - jruby-head
   - ruby-head
   - ruby-head-clang

diff --git a/Contributing.rdoc b/Contributing.rdoc
@@ -33,9 +33,6 @@ in +type-lists/application.yml+.
     extensions:
     - xml
     - xsl
-    references:
-    - IANA
-    - RFC3023
     xrefs: !ruby/hash:MIME::Types::Container
       rfc:
       - rfc3023

diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@
 # NOTE: This file is present to keep Travis CI happy. Edits to it will not
 # be accepted.
 
-source "https://rubygems.org/"
+source 'https://rubygems.org/'
 gemspec
 
 # vim: syntax=ruby