[DRE-commits] [ruby-sidekiq] 01/06: Merge tag 'upstream/3.2.2'

[Praveen Arimbrathodiyil]

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

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

commit e4e052aeb21fc5b6cd6ce525d4194daf2d461128
Merge: ec69b19 2642f90
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Aug 26 15:53:51 2014 +0530

    Merge tag 'upstream/3.2.2'
    
    Upstream version 3.2.2

 .travis.yml                                    |   7 +-
 3.0-Upgrade.md                                 |   9 +-
 Changes.md                                     | 104 +++++-
 Contributing.md                                |  14 +-
 LICENSE                                        |   2 +-
 Pro-Changes.md                                 |  51 ++-
 README.md                                      |  17 +-
 Rakefile                                       |   1 +
 checksums.yaml.gz                              | Bin 268 -> 271 bytes
 lib/sidekiq.rb                                 |  26 +-
 lib/sidekiq/api.rb                             | 194 +++++++++--
 lib/sidekiq/cli.rb                             |  70 ++--
 lib/sidekiq/extensions/class_methods.rb        |   2 +-
 lib/sidekiq/fetch.rb                           |   7 +-
 lib/sidekiq/launcher.rb                        |  19 +-
 lib/sidekiq/logging.rb                         |   5 +-
 lib/sidekiq/manager.rb                         |  25 +-
 lib/sidekiq/middleware/server/active_record.rb |   2 +-
 lib/sidekiq/middleware/server/retry_jobs.rb    |  68 ++--
 lib/sidekiq/processor.rb                       |  11 +-
 lib/sidekiq/rails.rb                           |  31 +-
 lib/sidekiq/redis_connection.rb                |   8 +-
 lib/sidekiq/scheduled.rb                       |  35 +-
 lib/sidekiq/testing.rb                         |   1 +
 lib/sidekiq/util.rb                            |  13 +-
 lib/sidekiq/version.rb                         |   2 +-
 lib/sidekiq/web.rb                             |  92 +++---
 lib/sidekiq/web_helpers.rb                     |  12 +
 metadata.yml                                   |  18 +-
 sidekiq.gemspec                                |   4 +-
 test/helper.rb                                 |   8 +-
 test/test_api.rb                               |  47 ++-
 test/test_cli.rb                               |  32 +-
 test/test_client.rb                            |   2 +-
 test/test_extensions.rb                        |  15 +
 test/test_fetch.rb                             |   6 +-
 test/test_manager.rb                           |  71 ++++
 test/test_redis_connection.rb                  |   8 +
 test/test_retry.rb                             |  62 ++++
 test/test_scheduling.rb                        |   1 +
 test/test_sidekiq.rb                           |   2 +
 test/test_web.rb                               |  81 ++++-
 web/assets/javascripts/dashboard.js            | 155 +++++++--
 web/assets/stylesheets/application.css         | 436 ++++++-------------------
 web/locales/de.yml                             |   1 +
 web/locales/en.yml                             |   7 +
 web/locales/es.yml                             |   1 +
 web/locales/fr.yml                             |   7 +-
 web/locales/it.yml                             |   1 +
 web/locales/ja.yml                             |  10 +-
 web/locales/ko.yml                             |   9 +-
 web/locales/ru.yml                             |   1 +
 web/locales/zh-cn.yml                          |  68 ++++
 web/views/_footer.erb                          |  22 ++
 web/views/_job_info.erb                        |   8 +-
 web/views/_nav.erb                             |  56 ++--
 web/views/_poll.erb                            |  10 +-
 web/views/busy.erb                             |  41 ++-
 web/views/dashboard.erb                        |  51 +--
 web/views/layout.erb                           |  31 +-
 web/views/morgue.erb                           |   8 +-
 web/views/queue.erb                            |  18 +-
 web/views/queues.erb                           |   3 +
 web/views/retries.erb                          |  11 +-
 web/views/scheduled.erb                        |  10 +-
 65 files changed, 1420 insertions(+), 730 deletions(-)

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