[DRE-commits] [ruby-carrierwave] 01/07: Merge tag 'upstream/0.10.0'

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Thu Apr 24 16:00:51 UTC 2014


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

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

commit 4d1c73569df8097b3b6a15dadf7a8c36d2e14859
Merge: 725249c a6b3814
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Apr 24 20:43:44 2014 +0530

    Merge tag 'upstream/0.10.0'
    
    Upstream version 0.10.0
    
    Conflicts:
    	.gitignore

 .gitignore                                         |  16 -
 .travis.yml                                        |  30 -
 CONTRIBUTING.md                                    |  38 -
 Gemfile                                            |   3 -
 History.txt                                        | 330 ---------
 README.md                                          | 167 ++++-
 Rakefile                                           |  27 -
 carrierwave.gemspec                                |  38 -
 checksums.yaml.gz                                  | Bin 0 -> 267 bytes
 cucumber.yml                                       |   2 -
 features/caching.feature                           |  28 -
 features/download.feature                          |  20 -
 features/file_storage.feature                      |  37 -
 features/file_storage_overridden_filename.feature  |  38 -
 features/file_storage_overridden_store_dir.feature |  38 -
 features/file_storage_reversing_processor.feature  |  43 --
 features/fixtures/bork.txt                         |   1 -
 features/fixtures/monkey.txt                       |   1 -
 features/fixtures/upcased_bork.txt                 |   1 -
 features/mount_activerecord.feature                |  46 --
 features/step_definitions/activerecord_steps.rb    |  22 -
 features/step_definitions/caching_steps.rb         |  14 -
 features/step_definitions/datamapper_steps.rb      |  29 -
 features/step_definitions/download_steps.rb        |  12 -
 features/step_definitions/file_steps.rb            |  53 --
 features/step_definitions/general_steps.rb         | 104 ---
 features/step_definitions/mount_steps.rb           |  19 -
 features/step_definitions/store_steps.rb           |  18 -
 features/support/activerecord.rb                   |  34 -
 features/support/env.rb                            |  21 -
 features/versions_basics.feature                   |  50 --
 features/versions_caching_from_versions.feature    |  32 -
 features/versions_nested_versions.feature          |  70 --
 features/versions_overridden_filename.feature      |  51 --
 features/versions_overriden_store_dir.feature      |  41 --
 gemfiles/rails3_2.gemfile                          |   6 -
 gemfiles/rails_master.gemfile                      |   8 -
 lib/carrierwave.rb                                 |   8 +
 lib/carrierwave/compatibility/paperclip.rb         |  48 +-
 lib/carrierwave/locale/cs.yml                      |  11 +
 lib/carrierwave/locale/de.yml                      |  11 +
 lib/carrierwave/locale/el.yml                      |  11 +
 lib/carrierwave/locale/es.yml                      |  11 +
 lib/carrierwave/locale/fr.yml                      |  11 +
 lib/carrierwave/locale/ja.yml                      |  11 +
 lib/carrierwave/locale/nb.yml                      |  11 +
 lib/carrierwave/locale/nl.yml                      |  11 +
 lib/carrierwave/locale/pl.yml                      |  11 +
 lib/carrierwave/locale/pt-BR.yml                   |  11 +
 lib/carrierwave/locale/pt-PT.yml                   |  11 +
 lib/carrierwave/locale/ru.yml                      |  11 +
 lib/carrierwave/locale/sk.yml                      |  11 +
 lib/carrierwave/locale/tr.yml                      |  11 +
 lib/carrierwave/mount.rb                           |  77 +-
 lib/carrierwave/orm/activerecord.rb                |   3 +-
 lib/carrierwave/processing/mime_types.rb           |   1 +
 lib/carrierwave/processing/mini_magick.rb          |  17 +-
 lib/carrierwave/processing/rmagick.rb              |  31 +-
 lib/carrierwave/sanitized_file.rb                  |  17 +-
 lib/carrierwave/storage/fog.rb                     |  27 +-
 lib/carrierwave/uploader/cache.rb                  |  10 +-
 lib/carrierwave/uploader/configuration.rb          |  16 +-
 lib/carrierwave/uploader/download.rb               |  32 +-
 lib/carrierwave/uploader/processing.rb             |  32 +-
 lib/carrierwave/uploader/proxy.rb                  |  11 +
 lib/carrierwave/uploader/serialization.rb          |   8 +-
 lib/carrierwave/uploader/url.rb                    |   3 +-
 lib/carrierwave/uploader/versions.rb               | 135 ++--
 lib/carrierwave/utilities.rb                       |   9 +
 lib/carrierwave/utilities/deprecation.rb           |  18 +
 lib/carrierwave/utilities/uri.rb                   |  24 +
 lib/carrierwave/validations/active_model.rb        |   2 -
 lib/carrierwave/version.rb                         |   2 +-
 lib/generators/templates/uploader.rb               |   8 +-
 lib/generators/uploader_generator.rb               |   2 +-
 metadata.yml                                       | 311 ++++++++
 script/console                                     |  10 -
 script/destroy                                     |  14 -
 script/generate                                    |  14 -
 spec/compatibility/paperclip_spec.rb               |  52 --
 spec/fixtures/Uppercase.jpg                        |   1 -
 spec/fixtures/bork.ttxt                            |   1 -
 spec/fixtures/bork.txt                             |   1 -
 spec/fixtures/bork.txtt                            |   1 -
 spec/fixtures/case.JPG                             |   1 -
 spec/fixtures/landscape.jpg                        | Bin 168662 -> 0 bytes
 spec/fixtures/multi_page.pdf                       | Bin 55196 -> 0 bytes
 spec/fixtures/new.jpeg                             |   1 -
 spec/fixtures/new.txt                              |   1 -
 spec/fixtures/old.jpeg                             |   1 -
 spec/fixtures/old.txt                              |   1 -
 spec/fixtures/portrait.jpg                         | Bin 43379 -> 0 bytes
 spec/fixtures/sponsored.doc                        |   1 -
 spec/fixtures/test.jpeg                            |   1 -
 spec/fixtures/test.jpg                             |   1 -
 spec/fog_credentials.rb                            |  46 --
 spec/mount_spec.rb                                 | 776 --------------------
 spec/orm/activerecord_spec.rb                      | 781 ---------------------
 spec/processing/mime_types_spec.rb                 |  71 --
 spec/processing/mini_magick_spec.rb                | 109 ---
 spec/processing/rmagick_spec.rb                    | 148 ----
 spec/sanitized_file_spec.rb                        | 763 --------------------
 spec/spec_helper.rb                                | 115 ---
 spec/storage/fog_helper.rb                         | 296 --------
 spec/storage/fog_spec.rb                           |   7 -
 spec/uploader/cache_spec.rb                        | 318 ---------
 spec/uploader/callback_spec.rb                     |  24 -
 spec/uploader/configuration_spec.rb                | 105 ---
 spec/uploader/default_url_spec.rb                  |  85 ---
 spec/uploader/download_spec.rb                     | 172 -----
 spec/uploader/extension_blacklist_spec.rb          |  78 --
 spec/uploader/extension_whitelist_spec.rb          |  79 ---
 spec/uploader/mountable_spec.rb                    |  33 -
 spec/uploader/overrides_spec.rb                    |  69 --
 spec/uploader/paths_spec.rb                        |  27 -
 spec/uploader/processing_spec.rb                   | 162 -----
 spec/uploader/proxy_spec.rb                        |  54 --
 spec/uploader/remove_spec.rb                       |  70 --
 spec/uploader/store_spec.rb                        | 388 ----------
 spec/uploader/url_spec.rb                          | 185 -----
 spec/uploader/versions_spec.rb                     | 510 --------------
 121 files changed, 953 insertions(+), 7114 deletions(-)

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



More information about the Pkg-ruby-extras-commits mailing list