Merge f61a417 into d8121f7

gitlabhq · Jul 27, 2015 · 66e115a · 66e115a
2 parents d8121f7 + f61a417
commit 66e115a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ group :development, :test do
   gem 'pry'
   gem 'rake'
   gem 'posix-spawn', "~> 0.3.6"
-  gem 'mime-types', "~> 1.15"
+  gem 'mime-types', "~> 2.6"
   gem 'diff-lcs', "~> 1.1"
   gem 'mocha', "~> 0.13.2"
   gem 'coveralls', require: false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,7 +4,7 @@ PATH
     gitlab-grit (2.7.3)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
+      mime-types (~> 2.6)
       posix-spawn (~> 0.3)
 
 GEM
@@ -56,7 +56,7 @@ DEPENDENCIES
   coveralls
   diff-lcs (~> 1.1)
   gitlab-grit!
-  mime-types (~> 1.15)
+  mime-types (~> 2.6)
   mocha (~> 0.13.2)
   posix-spawn (~> 0.3.6)
   pry

diff --git a/gitlab-grit.gemspec b/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.15")
+  s.add_dependency('mime-types', "~> 2.6")
   s.add_dependency('diff-lcs', "~> 1.1")
   s.add_development_dependency('mocha')
 end