Merge pull request #57 from gitlabhq/update-mime-types-dependency

Update mime types dependency

Author: dzaporozhets

.travis.yml

@@ -6,8 +6,7 @@ branches:
   only:
     - 'master'
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.0
 before_script:
   - "bundle install"
 script: "bundle exec rake test"

Gemfile

@@ -11,4 +11,5 @@ group :development, :test do
   gem 'mocha', "~> 0.13.2"
   gem 'coveralls', require: false
   gem 'rspec', '~> 2.11'
+  gem 'test-unit'
 end

Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    gitlab-grit (2.8.1)
+    gitlab-grit (2.8.2)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
-      mime-types (>= 1.16, < 3)
+      mime-types (>= 1.16)
       posix-spawn (~> 0.3)
 
 GEM
@@ -27,6 +27,7 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.7.2)
     posix-spawn (0.3.6)
+    power_assert (0.2.6)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -47,6 +48,8 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     slop (3.4.4)
+    test-unit (3.1.5)
+      power_assert
     thor (0.18.0)
 
 PLATFORMS
@@ -62,6 +65,7 @@ DEPENDENCIES
   pry
   rake
   rspec (~> 2.11)
+  test-unit
 
 BUNDLED WITH
-   1.11.2
+   1.15.3

History.txt

@@ -1,5 +1,8 @@
+== 2.8.2
+  * Remove the pessimistic `< 3` condition on mime-types
+
 == 2.8.1
-  * Resolve dependencies in better way and fix bundle install 
+  * Resolve dependencies in better way and fix bundle install
 
 == 2.8.0
   * Update mime-types dependency
@@ -12,7 +15,7 @@
 
 == 2.7.1
   * Suppress 'unkown header' warnings
-  * Add process.out to CommandFailed error 
+  * Add process.out to CommandFailed error
 
 == 2.7.0
   * Remove the `chdir:` option for thread-safety

VERSION

@@ -1 +1 @@
-2.8.1
+2.8.2

gitlab-grit.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency("charlock_holmes", "~> 0.6")
   s.add_dependency('posix-spawn', "~> 0.3")
-  s.add_dependency('mime-types', ">= 1.16", "< 3")
+  s.add_dependency('mime-types', ">= 1.16")
   s.add_dependency('diff-lcs', "~> 1.1")
   s.add_development_dependency('mocha')
 end