Merge branch 'master' into kreuzwerker
Showing
.travis.yml
0 → 100644
CONTRIBUTING.md
0 → 100644
| source "http://rubygems.org" | ||
| gem "shoulda" | ||
| gem "activerecord", :require => "active_record" | ||
| gem "appraisal" | ||
| gem "aruba" | ||
| gem "aws-s3", :require => "aws/s3" | ||
| gem "bundler" | ||
| gem "cocaine", "~>0.2" | ||
| gem "fog" | ||
| gem "jruby-openssl", :platform => :jruby | ||
| gem "mime-types" | ||
| gem "mocha" | ||
| gem "rake" | ||
| gem "ruby-debug" | ||
| gem "aws-s3", :require => "aws/s3" | ||
| gem "sqlite3-ruby", "~>1.3.0" | ||
| gem "appraisal" | ||
| gem "rdoc", :require => false | ||
| gem "capybara" | ||
| gem "cucumber", "~> 1.0.0" | ||
| gem "shoulda" | ||
| gem "sqlite3", "~>1.3.4" | ||
| gem "fakeweb", :require => false | ||
| gem 'pry' | 
Gemfile.lock
deleted
100644 → 0
features/basic.feature
deleted
100644 → 0
features/basic_integration.feature
0 → 100644
features/rake_tasks.feature
0 → 100644
features/s3.feature
deleted
100644 → 0
features/support/fakeweb.rb
0 → 100644
File added
features/support/fixtures/boot_config.txt
0 → 100644
features/support/fixtures/gemfile.txt
0 → 100644
features/support/fixtures/preinitializer.txt
0 → 100644
features/support/s3.rb
deleted
100644 → 0
features/support/selectors.rb
0 → 100644
gemfiles/rails2.gemfile.lock
deleted
100644 → 0
gemfiles/rails3.gemfile.lock
deleted
100644 → 0
gemfiles/rails3_1.gemfile
0 → 100644
lib/paperclip/command_line.rb
deleted
100644 → 0
lib/paperclip/interpolated_string.rb
0 → 100644
lib/paperclip/missing_attachment_styles.rb
0 → 100644
lib/paperclip/options.rb
0 → 100644
lib/paperclip/storage/fog.rb
0 → 100644
| ... | ... | @@ -13,7 +13,7 @@ spec = Gem::Specification.new do |s| | 
| s.version = Paperclip::VERSION | ||
| s.author = "Jon Yurek" | ||
| s.email = "jyurek@thoughtbot.com" | ||
| s.homepage = "http://www.thoughtbot.com/projects/paperclip" | ||
| s.homepage = "https://github.com/thoughtbot/paperclip" | ||
| s.description = "Easy upload management for ActiveRecord" | ||
| s.platform = Gem::Platform::RUBY | ||
| s.summary = "File attachments as attributes for ActiveRecord" | ||
| ... | ... | @@ -21,15 +21,18 @@ spec = Gem::Specification.new do |s| | 
| s.require_path = "lib" | ||
| s.test_files = Dir["test/**/test_*.rb"] | ||
| s.rubyforge_project = "paperclip" | ||
| s.has_rdoc = true | ||
| s.extra_rdoc_files = Dir["README*"] | ||
| s.rdoc_options << '--line-numbers' << '--inline-source' | ||
| s.requirements << "ImageMagick" | ||
| s.add_dependency 'activerecord' | ||
| s.add_dependency 'activesupport' | ||
| s.add_dependency 'activerecord', '>=2.3.0' | ||
| s.add_dependency 'activesupport', '>=2.3.2' | ||
| s.add_dependency 'cocaine', '>=0.0.2' | ||
| s.add_dependency 'mime-types' | ||
| s.add_development_dependency 'shoulda' | ||
| s.add_development_dependency 'appraisal' | ||
| s.add_development_dependency 'mocha' | ||
| s.add_development_dependency 'aws-s3' | ||
| s.add_development_dependency 'sqlite3-ruby' | ||
| s.add_development_dependency 'sqlite3' | ||
| s.add_development_dependency 'cucumber' | ||
| s.add_development_dependency 'capybara' | ||
| end | 
test/command_line_test.rb
deleted
100644 → 0
test/fixtures/animated.gif
0 → 100644
 
8.04 KB
test/fixtures/fog.yml
0 → 100644
test/fixtures/spaced file.png
0 → 100644
 
4.35 KB
test/fog_test.rb
0 → 100644
test/interpolated_string_test.rb
0 → 100644
test/options_test.rb
0 → 100644
test/storage/filesystem_test.rb
0 → 100644
test/storage/s3_live_test.rb
0 → 100644
Please
register
or
sign in
to comment
