[DRE-commits] [ruby-carrierwave] 01/06: Merge tag 'upstream/0.11.2'

[Sruthi Chandran]

This is an automated email from the git hooks/post-receive script.

srud-guest pushed a commit to branch master
in repository ruby-carrierwave.

commit 7c07803285e77b60874b5bdf8baf0492095e0179
Merge: afd3923 5deaa22
Author: Sruthi Chandran <srud at disroot.org>
Date:   Fri Aug 26 23:40:51 2016 +0530

    Merge tag 'upstream/0.11.2'
    
    Upstream version 0.11.2

 .travis.yml                                        |  25 +-
 CHANGELOG.md                                       |  19 ++
 History.txt                                        | 344 ---------------------
 README.md                                          |  16 +
 carrierwave.gemspec                                |   7 +-
 features/caching.feature                           |   6 +-
 features/file_storage.feature                      |   4 +-
 features/file_storage_overridden_filename.feature  |   4 +-
 features/file_storage_overridden_store_dir.feature |   4 +-
 features/file_storage_reversing_processor.feature  |   4 +-
 features/versions_basics.feature                   |   6 +-
 features/versions_nested_versions.feature          |  10 +-
 features/versions_overridden_filename.feature      |   6 +-
 features/versions_overriden_store_dir.feature      |   6 +-
 gemfiles/rails-3-2-stable.gemfile                  |   9 +
 gemfiles/rails-4-0-stable.gemfile                  |   9 +
 gemfiles/rails-4-1-stable.gemfile                  |   9 +
 lib/carrierwave/processing/rmagick.rb              |   2 +
 lib/carrierwave/sanitized_file.rb                  |  27 +-
 lib/carrierwave/storage.rb                         |   8 +-
 lib/carrierwave/storage/fog.rb                     |   2 -
 lib/carrierwave/uploader.rb                        |   4 +
 lib/carrierwave/uploader/cache.rb                  |  22 +-
 lib/carrierwave/uploader/content_type_blacklist.rb |  48 +++
 lib/carrierwave/uploader/content_type_whitelist.rb |  48 +++
 lib/carrierwave/version.rb                         |   2 +-
 spec/compatibility/paperclip_spec.rb               |   4 +-
 spec/fixtures/jpg.png                              | Bin 0 -> 168662 bytes
 spec/mount_spec.rb                                 |   2 +-
 spec/orm/activerecord_spec.rb                      |   8 +
 spec/sanitized_file_spec.rb                        |  15 +
 spec/spec_helper.rb                                |   4 +-
 spec/support/activerecord.rb                       |  19 +-
 spec/uploader/cache_spec.rb                        |   2 +-
 spec/uploader/callback_spec.rb                     |   6 +-
 spec/uploader/content_type_blacklist_spec.rb       |  47 +++
 spec/uploader/content_type_whitelist_spec.rb       |  47 +++
 37 files changed, 378 insertions(+), 427 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-carrierwave.git