[DRE-commits] [ruby-sidekiq] 02/06: Merge tag 'upstream/3.3.4_dfsg'

[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 50bf72cb7fd5b0a20bafb6775f2381ca2a9ee865
Merge: 1f59a2d 0872191
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat May 2 12:21:17 2015 +0530

    Merge tag 'upstream/3.3.4_dfsg'
    
    Upstream version 3.3.4~dfsg
    
    # gpg: Signature made Saturday 02 May 2015 12:21:09 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"

 .travis.yml                                        |  16 +-
 COMM-LICENSE                                       |   2 +
 Changes.md                                         |  43 +++++
 Contributing.md                                    |  23 +--
 Pro-2.0-Upgrade.md                                 | 138 ++++++++++++++
 Pro-Changes.md                                     |  34 ++++
 README.md                                          |  18 +-
 Rakefile                                           |   1 -
 bin/sidekiqctl                                     |  30 +--
 lib/sidekiq.rb                                     |  39 ++--
 lib/sidekiq/api.rb                                 | 211 +++++++++++++++------
 lib/sidekiq/cli.rb                                 |  27 +--
 lib/sidekiq/client.rb                              |  53 +++---
 lib/sidekiq/extensions/action_mailer.rb            |   7 +-
 lib/sidekiq/fetch.rb                               |   2 +-
 lib/sidekiq/launcher.rb                            |   7 +-
 lib/sidekiq/logging.rb                             |  15 +-
 lib/sidekiq/manager.rb                             |  11 +-
 lib/sidekiq/middleware/chain.rb                    |   4 +-
 lib/sidekiq/middleware/server/logging.rb           |   8 +-
 lib/sidekiq/middleware/server/retry_jobs.rb        |  22 ++-
 lib/sidekiq/paginator.rb                           |   8 +-
 lib/sidekiq/processor.rb                           |  12 +-
 lib/sidekiq/redis_connection.rb                    |   5 +-
 lib/sidekiq/scheduled.rb                           |  62 +++---
 lib/sidekiq/testing.rb                             |  17 +-
 lib/sidekiq/util.rb                                |  11 +-
 lib/sidekiq/version.rb                             |   2 +-
 lib/sidekiq/web.rb                                 |  53 ++++--
 lib/sidekiq/web_helpers.rb                         |  87 +++++++--
 lib/sidekiq/worker.rb                              |   9 +-
 metadata.yml                                       |  21 +-
 sidekiq.gemspec                                    |   2 +-
 test/test_api.rb                                   |  37 ++--
 test/test_cli.rb                                   |   2 +-
 test/test_client.rb                                |   2 +-
 test/test_exception_handler.rb                     |   2 +-
 test/test_extensions.rb                            |   2 +-
 test/test_fetch.rb                                 |   2 +-
 test/test_logging.rb                               |  34 ++++
 test/test_manager.rb                               |   4 +-
 test/test_middleware.rb                            |   2 +-
 test/test_processor.rb                             |   2 +-
 test/test_redis_connection.rb                      |   2 +-
 test/test_retry.rb                                 |  46 ++++-
 test/test_scheduled.rb                             |   2 +-
 test/test_scheduling.rb                            |  11 +-
 test/test_sidekiq.rb                               |  14 +-
 test/test_testing.rb                               |   2 +-
 test/test_testing_fake.rb                          |   2 +-
 test/test_testing_inline.rb                        |   2 +-
 test/test_web.rb                                   |  74 +++++++-
 test/test_web_helpers.rb                           |  46 +++++
 test/test_worker_generator.rb                      |   2 +-
 .../javascripts/locales/jquery.timeago.uz.js       |   0
 ...ry.timeago.zh-CN.js => jquery.timeago.zh-cn.js} |   0
 ...ry.timeago.zh-TW.js => jquery.timeago.zh-tw.js} |   0
 web/assets/stylesheets/application.css             |  92 +++++++--
 web/locales/en.yml                                 |   1 +
 web/locales/hi.yml                                 |  75 ++++++++
 web/locales/ru.yml                                 |   9 +-
 web/locales/ta.yml                                 |  75 ++++++++
 web/views/_footer.erb                              |   6 +-
 web/views/_nav.erb                                 |  85 ++++++---
 web/views/_poll.erb                                |   6 +-
 web/views/_summary.erb                             |   2 +-
 web/views/busy.erb                                 |   7 +-
 web/views/dashboard.erb                            |   6 +-
 web/views/layout.erb                               |   1 +
 69 files changed, 1267 insertions(+), 390 deletions(-)

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