Skip to content

Commit

Permalink
update paperclip gem
Browse files Browse the repository at this point in the history
  • Loading branch information
thutterer committed Feb 19, 2018
1 parent f8a6153 commit f2028e3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ gem 'faker', :group => [:development, :test]
gem 'rspec-rails', :group => [:development, :test]
gem 'capybara', :group => [:development, :test]
# for file attachments
gem 'paperclip', '~> 4.1'
gem 'paperclip', '~> 5.2'
# as interactive debugger in error pages
gem 'web-console', '~> 2.0', group: :development
# as deployer
Expand Down
15 changes: 7 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
climate_control (0.0.3)
activesupport (>= 3.0)
climate_control (0.2.0)
cliver (0.3.2)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
Expand Down Expand Up @@ -156,7 +155,7 @@ GEM
method_source (0.8.2)
middleware (0.1.0)
mime-types (2.99.3)
mimemagic (0.3.0)
mimemagic (0.3.2)
mina (0.3.8)
open4 (~> 1.3.4)
rake
Expand All @@ -170,12 +169,12 @@ GEM
mini_portile2 (~> 2.1.0)
open4 (1.3.4)
orm_adapter (0.5.0)
paperclip (4.3.6)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
paperclip (5.2.1)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (= 0.3.0)
mimemagic (~> 0.3.0)
parallel (1.12.0)
parser (2.4.0.2)
ast (~> 2.3)
Expand Down Expand Up @@ -354,7 +353,7 @@ DEPENDENCIES
mina (~> 0.3)
mousetrap-rails
mysql2
paperclip (~> 4.1)
paperclip (~> 5.2)
poltergeist
pry-byebug
pry-rails
Expand Down

0 comments on commit f2028e3

Please sign in to comment.