Skip to content

Commit a397c65

Browse files
authored
Merge pull request #411 from DefactoSoftware/marcel/paperclip-cve
update paperclip due to cve
2 parents 0804dc7 + ce01798 commit a397c65

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ gem "twitter-text" # hashtag parsing
3636
gem "jquery-atwho-rails", "~> 1.3.2" # autocomplete
3737
gem "haml-rails"
3838
gem "audited-activerecord", "~> 4.0"
39-
gem "paperclip", "4.3.7"
39+
gem "paperclip", "~> 5.1.0"
4040
gem "aws-sdk", "< 2.0"
4141
gem "redcarpet"
4242
gem "holidays"

Gemfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ GEM
190190
mime-types (3.1)
191191
mime-types-data (~> 3.2015)
192192
mime-types-data (3.2016.0521)
193-
mimemagic (0.3.0)
193+
mimemagic (0.3.2)
194194
mini_mime (1.0.0)
195195
mini_portile2 (2.3.0)
196196
minitest (5.10.3)
@@ -205,12 +205,12 @@ GEM
205205
mini_portile2 (~> 2.3.0)
206206
normalize-rails (3.0.1)
207207
orm_adapter (0.5.0)
208-
paperclip (4.3.7)
209-
activemodel (>= 3.2.0)
210-
activesupport (>= 3.2.0)
208+
paperclip (5.1.0)
209+
activemodel (>= 4.2.0)
210+
activesupport (>= 4.2.0)
211211
cocaine (~> 0.5.5)
212212
mime-types
213-
mimemagic (= 0.3.0)
213+
mimemagic (~> 0.3.0)
214214
pg (0.18.4)
215215
pikaday-gem (1.2.0)
216216
railties (>= 3.1)
@@ -394,7 +394,7 @@ DEPENDENCIES
394394
neat
395395
newrelic_rpm (>= 3.7.3)
396396
normalize-rails
397-
paperclip (= 4.3.7)
397+
paperclip (~> 5.1.0)
398398
pg
399399
pikaday-gem (~> 1.2.0.0)
400400
pry
@@ -425,4 +425,4 @@ RUBY VERSION
425425
ruby 2.4.2p198
426426

427427
BUNDLED WITH
428-
1.16.0
428+
1.16.1

0 commit comments

Comments
 (0)