nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump carrierwave

Browse source
This commit is contained in:
Jonne Haß 2012-11-02 12:26:54 +01:00
parent f2f741a518
commit 4fc2cb1cba
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -53,7 +53,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
# file uploading # file uploading
gem 'carrierwave', '0.6.2' gem 'carrierwave', '0.7.1'
gem 'fog', '1.6.0' gem 'fog', '1.6.0'
gem 'mini_magick', '3.4' gem 'mini_magick', '3.4'

4
Gemfile.lock
View file

@ -77,7 +77,7 @@ GEM
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0) selenium-webdriver (~> 2.0)
xpath (~> 0.1.4) xpath (~> 0.1.4)
carrierwave (0.6.2) carrierwave (0.7.1)
activemodel (>= 3.2.0) activemodel (>= 3.2.0)
activesupport (>= 3.2.0) activesupport (>= 3.2.0)
childprocess (0.3.6) childprocess (0.3.6)
@ -429,7 +429,7 @@ DEPENDENCIES
capistrano-ext (= 1.2.1) capistrano-ext (= 1.2.1)
capistrano_colors (= 0.5.5) capistrano_colors (= 0.5.5)
capybara (= 1.1.3) capybara (= 1.1.3)
carrierwave (= 0.6.2) carrierwave (= 0.7.1)
client_side_validations (= 3.2.1) client_side_validations (= 3.2.1)
cucumber-rails (= 1.3.0) cucumber-rails (= 1.3.0)
database_cleaner (= 0.9.1) database_cleaner (= 0.9.1)

2
spec/models/photo_spec.rb
View file

@ -166,7 +166,7 @@ describe Photo do
file = File.open(@fail_fixture_name) file = File.open(@fail_fixture_name)
lambda { lambda {
@photo.unprocessed_image.store! file @photo.unprocessed_image.store! file
}.should raise_error CarrierWave::IntegrityError, 'You are not allowed to upload "xml" files, allowed types: ["jpg", "jpeg", "png", "gif"]' }.should raise_error CarrierWave::IntegrityError, 'You are not allowed to upload "xml" files, allowed types: jpg, jpeg, png, gif'
end end
end end