Skip to content

Commit

Permalink
Merge pull request spree#7 from project-eutopia/paperclip_upgrade
Browse files Browse the repository at this point in the history
Upgrade paperclip
  • Loading branch information
shioyama committed Sep 8, 2015
2 parents 0a58473 + 5cea054 commit bcae1fd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion core/app/models/spree/image.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Image < Asset
include Spree::Core::S3Support
supports_s3 :attachment

Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
Spree::Image.attachment_definitions[:attachment][:styles] ||= Hash[ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).map{|k,v| [k.to_sym, v]}]
Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
Spree::Image.attachment_definitions[:attachment][:url] = Spree::Config[:attachment_url]
Spree::Image.attachment_definitions[:attachment][:default_url] = Spree::Config[:attachment_default_url]
Expand Down
2 changes: 1 addition & 1 deletion core/spree_core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Gem::Specification.new do |s|
s.add_dependency 'highline', '= 1.6.18'
s.add_dependency 'state_machine', '= 1.1.2'
s.add_dependency 'ffaker', '~> 1.12.0'
s.add_dependency 'paperclip', '~> 2.7.0'
s.add_dependency 'paperclip', '~> 3.4.0'
s.add_dependency 'ransack', '0.7.2'
s.add_dependency 'activemerchant', '~> 1.34'
s.add_dependency 'json', '>= 1.5.5'
Expand Down

0 comments on commit bcae1fd

Please sign in to comment.