File tree Expand file tree Collapse file tree 2 files changed +15
-12
lines changed Expand file tree Collapse file tree 2 files changed +15
-12
lines changed Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ gem 'decent_exposure'
13
13
gem 'nokogiri' , '~> 1.6.7.2'
14
14
gem 'react-rails' , '~> 1.3.2'
15
15
gem 'foreman'
16
- gem 'paperclip' , '~> 4 .3.6'
16
+ gem 'paperclip' , git : 'https://github.com/instedd/paperclip' , branch : 'fix/v4 .3.6-no-mimemagic '
17
17
gem 'aws-sdk' , '~> 1.6'
18
18
gem 'newrelic_rpm'
19
19
gem 'paranoia'
Original file line number Diff line number Diff line change 13
13
specs:
14
14
geojson_import (0.0.2 )
15
15
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
+
16
27
GIT
17
28
remote: https://github.com/instedd/poirot_rails.git
18
29
revision: c3e8ceeacd07a226b941a8cabb2dd762fa73846f
190
201
childprocess (0.5.9 )
191
202
ffi (~> 1.0 , >= 1.0.11 )
192
203
chunky_png (1.3.1 )
193
- climate_control (0.0.3 )
194
- activesupport (>= 3.0 )
204
+ climate_control (0.2.0 )
195
205
clipboard (1.0.6 )
196
206
cliver (0.3.2 )
197
207
cocaine (0.5.8 )
363
373
webrobots (>= 0.0.9 , < 0.2 )
364
374
method_source (0.8.2 )
365
375
mime-types (2.99.1 )
366
- mimemagic (0.3.0 )
367
376
mini_portile2 (2.0.0 )
368
377
minitest (5.8.4 )
369
378
multi_json (1.11.2 )
405
414
oauth2 (~> 1.0 )
406
415
omniauth (~> 1.2 )
407
416
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 )
414
417
paranoia (2.1.4 )
415
418
activerecord (~> 4.0 )
416
419
poltergeist (1.7.0 )
@@ -692,7 +695,7 @@ DEPENDENCIES
692
695
oj
693
696
omniauth
694
697
omniauth-google-oauth2
695
- paperclip ( ~> 4.3.6 )
698
+ paperclip !
696
699
paranoia
697
700
poirot_rails !
698
701
poltergeist
@@ -737,4 +740,4 @@ DEPENDENCIES
737
740
webmock
738
741
739
742
BUNDLED WITH
740
- 1.11.2
743
+ 1.16.1
You can’t perform that action at this time.
0 commit comments