Merge branch 'master' into v4.2
Showing
.hound.yml
0 → 100644
.rubocop.yml
0 → 100644
... | ... | @@ -2,7 +2,7 @@ source "https://rubygems.org" |
gemspec | ||
gem 'sqlite3', '1.3.8', :platforms => :ruby | ||
gem 'sqlite3', '~>1.3.8', :platforms => :ruby | ||
gem 'jruby-openssl', :platforms => :jruby | ||
gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby | ||
... | ... | @@ -17,4 +17,5 @@ gem 'pry' |
group :development, :test do | ||
gem 'mime-types', '~> 1.16' | ||
gem 'builder' | ||
gem 'rubocop', require: false | ||
end |
RELEASING.md
0 → 100644
RUNNING_TESTS.md
deleted
100644 → 0
lib/paperclip/rails_environment.rb
0 → 100644
... | ... | @@ -12,8 +12,6 @@ Gem::Specification.new do |s| |
s.description = "Easy upload management for ActiveRecord" | ||
s.license = "MIT" | ||
s.rubyforge_project = "paperclip" | ||
s.files = `git ls-files`.split("\n") | ||
s.test_files = `git ls-files -- {spec,features}/*`.split("\n") | ||
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } | ||
... | ... | @@ -24,21 +22,22 @@ Gem::Specification.new do |s| |
s.add_dependency('activemodel', '>= 3.0.0') | ||
s.add_dependency('activesupport', '>= 3.0.0') | ||
s.add_dependency('cocaine', '~> 0.5.3') | ||
s.add_dependency('cocaine', '~> 0.5.5') | ||
s.add_dependency('mime-types') | ||
s.add_dependency('mimemagic', '0.3.0') | ||
s.add_development_dependency('activerecord', '>= 3.0.0') | ||
s.add_development_dependency('shoulda') | ||
s.add_development_dependency('rspec') | ||
s.add_development_dependency('appraisal') | ||
s.add_development_dependency('mocha') | ||
s.add_development_dependency('aws-sdk', '>= 1.5.7') | ||
s.add_development_dependency('aws-sdk', '~> 1.6') | ||
s.add_development_dependency('bourne') | ||
s.add_development_dependency('cucumber', '~> 1.3.11') | ||
s.add_development_dependency('cucumber', '~> 1.3.18') | ||
s.add_development_dependency('aruba') | ||
s.add_development_dependency('nokogiri') | ||
# Ruby version < 1.9.3 can't install capybara > 2.0.3. | ||
s.add_development_dependency('capybara', '= 2.0.3') | ||
s.add_development_dependency('capybara') | ||
s.add_development_dependency('bundler') | ||
s.add_development_dependency('fog', '~> 1.0') | ||
s.add_development_dependency('launchy') | ||
... | ... |
spec/paperclip/rails_environment_spec.rb
0 → 100644
spec/support/fixtures/empty.xlsx
0 → 100644
File added
spec/support/mock_model.rb
deleted
100644 → 0
Please
register
or
sign in
to comment