Skip to content

Commit cda7b60

Browse files
committed
Remove the pessimistic < 3 condition on mime-types
This is needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/38286#note_41303108 Signed-off-by: Rémy Coutable <[email protected]>
1 parent d3c614f commit cda7b60

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

History.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
== 2.8.2
2+
* Remove the pessimistic `< 3` condition on mime-types
3+
14
== 2.8.1
2-
* Resolve dependencies in better way and fix bundle install
5+
* Resolve dependencies in better way and fix bundle install
36

47
== 2.8.0
58
* Update mime-types dependency
@@ -12,7 +15,7 @@
1215

1316
== 2.7.1
1417
* Suppress 'unkown header' warnings
15-
* Add process.out to CommandFailed error
18+
* Add process.out to CommandFailed error
1619

1720
== 2.7.0
1821
* Remove the `chdir:` option for thread-safety

gitlab-grit.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
1616

1717
s.add_dependency("charlock_holmes", "~> 0.6")
1818
s.add_dependency('posix-spawn', "~> 0.3")
19-
s.add_dependency('mime-types', ">= 1.16", "< 3")
19+
s.add_dependency('mime-types', ">= 1.16")
2020
s.add_dependency('diff-lcs', "~> 1.1")
2121
s.add_development_dependency('mocha')
2222
end

0 commit comments

Comments
 (0)