Commit 134f4ec 1 parent 4b4637c commit 134f4ec Copy full SHA for 134f4ec
File tree 3 files changed +14
-13
lines changed
3 files changed +14
-13
lines changed Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ gem 'uglifier'
17
17
18
18
gem 'acts_as_commentable_with_threading'
19
19
gem 'acts_as_list'
20
- gem 'aws-sdk' , '< 2.0'
20
+ gem 'aws-sdk' # , '< 2.0'
21
21
# Version locked because of bug when fetching s3 hosted PDF:
22
22
# `uninitialized constant Paperclip::Storage::S3::AWS`
23
23
# Test with: http://antcat.org/documents/6308/ward_2014_annu_rev_ecol_evol_syst_phylogeny_and_evolution_of_ants.pdf
@@ -38,7 +38,7 @@ gem 'jquery-rails', '> 4.0'
38
38
gem 'jquery-ui-rails' , '> 5.0'
39
39
gem 'newrelic_rpm'
40
40
gem 'paper_trail' , '< 10.0'
41
- gem 'paperclip' , '4 .3.1 '
41
+ gem 'paperclip' , '5 .3.0 '
42
42
gem 'rails-observers'
43
43
gem 'redcarpet'
44
44
gem 'ruby-progressbar'
Original file line number Diff line number Diff line change 102
102
nokogiri (~> 1.8 )
103
103
citrus (3.0.2 )
104
104
climate_control (0.2.0 )
105
- cocaine (0.5.8 )
106
- climate_control (>= 0.0.3 , < 1.0 )
107
105
coderay (1.1.2 )
108
106
coffee-rails (4.2.2 )
109
107
coffee-script (>= 2.2.0 )
113
111
execjs
114
112
coffee-script-source (1.12.2 )
115
113
colorize (0.8.1 )
116
- concurrent-ruby (1.0 .5 )
114
+ concurrent-ruby (1.1 .5 )
117
115
crack (0.4.3 )
118
116
safe_yaml (~> 1.0.0 )
119
117
crass (1.0.4 )
217
215
haml (>= 4.0 , < 6 )
218
216
nokogiri (>= 1.6.0 )
219
217
ruby_parser (~> 3.5 )
220
- i18n (1.1.1 )
218
+ i18n (1.6.0 )
221
219
concurrent-ruby (~> 1.0 )
222
220
invisible_captcha (0.11.0 )
223
221
rails (>= 3.2.0 )
247
245
mime-types (3.2.2 )
248
246
mime-types-data (~> 3.2015 )
249
247
mime-types-data (3.2018.0812 )
250
- mimemagic (0.3.0 )
248
+ mimemagic (0.3.3 )
251
249
mini_mime (1.0.1 )
252
250
mini_portile2 (2.3.0 )
253
251
minitest (5.11.3 )
@@ -269,12 +267,12 @@ GEM
269
267
paper_trail-association_tracking (< 2 )
270
268
request_store (~> 1.1 )
271
269
paper_trail-association_tracking (1.0.0 )
272
- paperclip (4.3.1 )
273
- activemodel (>= 3.2.0 )
274
- activesupport (>= 3.2.0 )
275
- cocaine (~> 0.5.5 )
270
+ paperclip (5.3.0 )
271
+ activemodel (>= 4.2.0 )
272
+ activesupport (>= 4.2.0 )
276
273
mime-types
277
- mimemagic (= 0.3.0 )
274
+ mimemagic (~> 0.3.0 )
275
+ terrapin (~> 0.6.0 )
278
276
parallel (1.12.1 )
279
277
parser (2.5.1.2 )
280
278
ast (~> 2.4.0 )
418
416
rails (>= 4.2 )
419
417
sass-rails
420
418
temple (0.8.0 )
419
+ terrapin (0.6.0 )
420
+ climate_control (>= 0.0.3 , < 1.0 )
421
421
thor (0.20.0 )
422
422
thread_safe (0.3.6 )
423
423
tilt (2.0.8 )
@@ -489,7 +489,7 @@ DEPENDENCIES
489
489
mysql2
490
490
newrelic_rpm
491
491
paper_trail (< 10.0 )
492
- paperclip (= 4 .3.1 )
492
+ paperclip (= 5 .3.0 )
493
493
pry
494
494
puma
495
495
rack
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ class ReferenceDocument < ApplicationRecord
12
12
storage : :s3 ,
13
13
s3_credentials : ( Rails . env . production? ? '/data/antcat/shared/config/' : Rails . root + 'config/' ) + 's3.yml' , # TODO move to `secrets.yml`
14
14
s3_permissions : 'authenticated-read' ,
15
+ s3_region : 'us-east-1' ,
15
16
s3_protocol : 'http'
16
17
before_post_process :transliterate_file_name
17
18
do_not_validate_attachment_file_type :pdf
You can’t perform that action at this time.
0 commit comments