Skip to content

Commit cb02622

Browse files
Stop depending on mimemagic
mimemagic was yanked due to licencing issues. We've forked paperclip to remove the mimemagic dependency to be able to keep building the project. See thoughtbot/paperclip#2678
1 parent f261de3 commit cb02622

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ gem 'decent_exposure'
1313
gem 'nokogiri', '~> 1.6.7.2'
1414
gem 'react-rails', '~> 1.3.2'
1515
gem 'foreman'
16-
gem 'paperclip', '~> 4.3.6'
16+
gem 'paperclip', git: 'https://github.com/instedd/paperclip', branch: 'fix/v4.3.6-no-mimemagic'
1717
gem 'aws-sdk', '~> 1.6'
1818
gem 'newrelic_rpm'
1919
gem 'paranoia'

Gemfile.lock

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,17 @@ GIT
1313
specs:
1414
geojson_import (0.0.2)
1515

16+
GIT
17+
remote: https://github.com/instedd/paperclip
18+
revision: 909ed091f80c763f9da8ae6cca4f2a93e49d7a69
19+
branch: fix/v4.3.6-no-mimemagic
20+
specs:
21+
paperclip (4.3.6)
22+
activemodel (>= 3.2.0)
23+
activesupport (>= 3.2.0)
24+
cocaine (~> 0.5.5)
25+
mime-types
26+
1627
GIT
1728
remote: https://github.com/instedd/poirot_rails.git
1829
revision: c3e8ceeacd07a226b941a8cabb2dd762fa73846f
@@ -190,8 +201,7 @@ GEM
190201
childprocess (0.5.9)
191202
ffi (~> 1.0, >= 1.0.11)
192203
chunky_png (1.3.1)
193-
climate_control (0.0.3)
194-
activesupport (>= 3.0)
204+
climate_control (0.2.0)
195205
clipboard (1.0.6)
196206
cliver (0.3.2)
197207
cocaine (0.5.8)
@@ -363,7 +373,6 @@ GEM
363373
webrobots (>= 0.0.9, < 0.2)
364374
method_source (0.8.2)
365375
mime-types (2.99.1)
366-
mimemagic (0.3.0)
367376
mini_portile2 (2.0.0)
368377
minitest (5.8.4)
369378
multi_json (1.11.2)
@@ -405,12 +414,6 @@ GEM
405414
oauth2 (~> 1.0)
406415
omniauth (~> 1.2)
407416
orm_adapter (0.5.0)
408-
paperclip (4.3.6)
409-
activemodel (>= 3.2.0)
410-
activesupport (>= 3.2.0)
411-
cocaine (~> 0.5.5)
412-
mime-types
413-
mimemagic (= 0.3.0)
414417
paranoia (2.1.4)
415418
activerecord (~> 4.0)
416419
poltergeist (1.7.0)
@@ -692,7 +695,7 @@ DEPENDENCIES
692695
oj
693696
omniauth
694697
omniauth-google-oauth2
695-
paperclip (~> 4.3.6)
698+
paperclip!
696699
paranoia
697700
poirot_rails!
698701
poltergeist
@@ -737,4 +740,4 @@ DEPENDENCIES
737740
webmock
738741

739742
BUNDLED WITH
740-
1.11.2
743+
1.16.1

0 commit comments

Comments
 (0)