[DRE-commits] [ruby-sidekiq] 01/04: Merge tag 'upstream/4.2.3+dfsg'

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Tue Nov 1 10:10:43 UTC 2016


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

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

commit 0e6b28c4bf005e818e018d966c9433d03e33c636
Merge: 396f12d 931e0c7
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Nov 1 14:59:31 2016 +0530

    Merge tag 'upstream/4.2.3+dfsg'
    
    Upstream version 4.2.3+dfsg
    
    # gpg: Signature made Tuesday 01 November 2016 02:59:30 PM IST using RSA key ID CE1F9C674512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>" [ultimate]
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>" [ultimate]
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>" [ultimate]

 .travis.yml                                        |   6 -
 Changes.md                                         |  50 +++
 Ent-Changes.md                                     |  25 +-
 Gemfile                                            |  10 +-
 Pro-Changes.md                                     |  26 ++
 README.md                                          |   4 +-
 lib/sidekiq.rb                                     |   9 +-
 lib/sidekiq/cli.rb                                 |  12 +-
 lib/sidekiq/launcher.rb                            |   6 +-
 lib/sidekiq/manager.rb                             |   1 +
 lib/sidekiq/processor.rb                           |  53 ++--
 lib/sidekiq/rails.rb                               |  54 ++++
 lib/sidekiq/scheduled.rb                           |   1 +
 lib/sidekiq/testing.rb                             |   2 +-
 lib/sidekiq/util.rb                                |   2 +-
 lib/sidekiq/version.rb                             |   2 +-
 lib/sidekiq/web.rb                                 | 303 ++++++++----------
 lib/sidekiq/web/action.rb                          |  93 ++++++
 lib/sidekiq/web/application.rb                     | 340 +++++++++++++++++++++
 lib/sidekiq/{web_helpers.rb => web/helpers.rb}     |  39 ++-
 lib/sidekiq/web/router.rb                          |  96 ++++++
 lib/sidekiq/worker.rb                              |   6 +-
 sidekiq.gemspec                                    |   4 +-
 test/test_cli.rb                                   |  16 +-
 test/test_launcher.rb                              |  14 +-
 test/test_scheduling.rb                            |   8 +
 test/test_web.rb                                   | 122 +++++++-
 .../bootstrap/glyphicons-halflings-white.png       | Bin 8777 -> 0 bytes
 .../images/bootstrap/glyphicons-halflings.png      | Bin 12799 -> 0 bytes
 .../images/{status-sd8051fd480.png => status.png}  | Bin
 web/assets/images/status/active.png                | Bin 2081 -> 0 bytes
 web/assets/images/status/idle.png                  | Bin 1980 -> 0 bytes
 web/assets/javascripts/locales/README.md           |  27 --
 .../javascripts/locales/jquery.timeago.ar.js       |  96 ------
 .../javascripts/locales/jquery.timeago.bg.js       |  18 --
 .../javascripts/locales/jquery.timeago.bs.js       |  49 ---
 .../javascripts/locales/jquery.timeago.ca.js       |  18 --
 .../javascripts/locales/jquery.timeago.cs.js       |  18 --
 .../javascripts/locales/jquery.timeago.cy.js       |  20 --
 .../javascripts/locales/jquery.timeago.da.js       |  18 --
 .../javascripts/locales/jquery.timeago.de.js       |  18 --
 .../javascripts/locales/jquery.timeago.el.js       |  18 --
 .../javascripts/locales/jquery.timeago.en-short.js |  20 --
 .../javascripts/locales/jquery.timeago.en.js       |  20 --
 .../javascripts/locales/jquery.timeago.es.js       |  18 --
 .../javascripts/locales/jquery.timeago.et.js       |  18 --
 .../javascripts/locales/jquery.timeago.fa.js       |  22 --
 .../javascripts/locales/jquery.timeago.fi.js       |  28 --
 .../javascripts/locales/jquery.timeago.fr-short.js |  16 -
 .../javascripts/locales/jquery.timeago.fr.js       |  17 --
 .../javascripts/locales/jquery.timeago.he.js       |  18 --
 .../javascripts/locales/jquery.timeago.hr.js       |  49 ---
 .../javascripts/locales/jquery.timeago.hu.js       |  18 --
 .../javascripts/locales/jquery.timeago.hy.js       |  18 --
 .../javascripts/locales/jquery.timeago.id.js       |  18 --
 .../javascripts/locales/jquery.timeago.it.js       |  16 -
 .../javascripts/locales/jquery.timeago.ja.js       |  19 --
 .../javascripts/locales/jquery.timeago.ko.js       |  17 --
 .../javascripts/locales/jquery.timeago.lt.js       |  20 --
 .../javascripts/locales/jquery.timeago.mk.js       |  20 --
 .../javascripts/locales/jquery.timeago.nb.js       |  18 --
 .../javascripts/locales/jquery.timeago.nl.js       |  20 --
 .../javascripts/locales/jquery.timeago.pl.js       |  31 --
 .../javascripts/locales/jquery.timeago.pt-br.js    |  16 -
 .../javascripts/locales/jquery.timeago.pt.js       |  16 -
 .../javascripts/locales/jquery.timeago.ro.js       |  18 --
 .../javascripts/locales/jquery.timeago.rs.js       |  49 ---
 .../javascripts/locales/jquery.timeago.ru.js       |  34 ---
 .../javascripts/locales/jquery.timeago.sk.js       |  18 --
 .../javascripts/locales/jquery.timeago.sl.js       |  44 ---
 .../javascripts/locales/jquery.timeago.sv.js       |  18 --
 .../javascripts/locales/jquery.timeago.th.js       |  20 --
 .../javascripts/locales/jquery.timeago.tr.js       |  16 -
 .../javascripts/locales/jquery.timeago.uk.js       |  34 ---
 .../javascripts/locales/jquery.timeago.uz.js       |  19 --
 .../javascripts/locales/jquery.timeago.zh-cn.js    |  20 --
 .../javascripts/locales/jquery.timeago.zh-tw.js    |  20 --
 web/assets/stylesheets/application.css             |  27 +-
 web/assets/stylesheets/bootstrap.css               |  12 +-
 web/locales/de.yml                                 |   2 +-
 web/views/_footer.erb                              |   2 +-
 web/views/_poll_js.erb                             |   5 -
 web/views/busy.erb                                 |   4 +-
 web/views/dashboard.erb                            |   4 +-
 web/views/dead.erb                                 |   2 +-
 web/views/layout.erb                               |   7 +-
 web/views/morgue.erb                               |   4 +-
 web/views/queue.erb                                |   6 +-
 web/views/queues.erb                               |   2 +-
 web/views/retries.erb                              |   4 +-
 web/views/retry.erb                                |   2 +-
 web/views/scheduled.erb                            |   4 +-
 web/views/scheduled_job_info.erb                   |   2 +-
 93 files changed, 1098 insertions(+), 1378 deletions(-)

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



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