sidekiq 2.15.0 → 2.15.1

data/Changes.md

@@ -1,3 +1,8 @@
+2.15.1
+-----------
+
+- Fix several Web UI issues with the Bootstrap 3 upgrade.
+
 2.15.0
 -----------
 
@@ -7,7 +12,7 @@
   appear to be doing any work. [#1194]
 - Sidekiq's testing behavior is now dynamic.  You can choose between
   `inline` and `fake` behavior in your tests. See
-[Testing](wiki/Testing) for detail. [#1193]
+[Testing](https://github.com/mperham/sidekiq/wiki/Testing) for detail. [#1193]
 - The Retries table has a new column for the error message.
 - The Web UI topbar now contains the status and live poll button.
 - Orphaned worker records are now auto-vacuumed when you vist the

data/Pro-Changes.md

@@ -3,6 +3,13 @@ Sidekiq Pro Changelog
 
 Please see http://sidekiq.org/pro for more details and how to buy.
 
+1.2.4
+-----------
+
+- Convert Batch UI to Bootstrap 3
+- Pro now requires Sidekiq 2.15.0
+- Add Sidekiq::Batch::Status#delete [#1205]
+
 1.2.3
 -----------
 

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.15.0"
+  VERSION = "2.15.1"
 end

data/web/views/_paging.erb

@@ -1,25 +1,23 @@
 <% if @total_size > @count %>
-  <div class="pagination pagination-right">
-    <ul>
-      <li class="<%= 'disabled' if @current_page == 1 %>">
-        <a href="<%= url %>?page=1">«</a>
+  <ul class="pagination pull-right">
+    <li class="<%= 'disabled' if @current_page == 1 %>">
+      <a href="<%= url %>?page=1">«</a>
+    </li>
+    <% if @current_page > 1 %>
+      <li>
+        <a href="<%= url %>?page=<%= @current_page - 1 %>"><%= @current_page - 1 %></a>
       </li>
-      <% if @current_page > 1 %>
-        <li>
-          <a href="<%= url %>?page=<%= @current_page - 1 %>"><%= @current_page - 1 %></a>
-        </li>
-      <% end %>
-      <li class="disabled">
-        <a href="<%= url %>?page=<%= @current_page %>"><%= @current_page %></a>
+    <% end %>
+    <li class="disabled">
+      <a href="<%= url %>?page=<%= @current_page %>"><%= @current_page %></a>
+    </li>
+    <% if @total_size > @current_page * @count %>
+      <li>
+        <a href="<%= url %>?page=<%= @current_page + 1 %>"><%= @current_page + 1 %></a>
       </li>
-      <% if @total_size > @current_page * @count %>
-        <li>
-          <a href="<%= url %>?page=<%= @current_page + 1 %>"><%= @current_page + 1 %></a>
-        </li>
-      <% end %>
-      <li class="<%= 'disabled' if @total_size <= @current_page * @count %>">
-        <a href="<%= url %>?page=<%= (@total_size.to_f / @count).ceil %>">»</a>
-      </li>
-    </ul>
-  </div>
+    <% end %>
+    <li class="<%= 'disabled' if @total_size <= @current_page * @count %>">
+      <a href="<%= url %>?page=<%= (@total_size.to_f / @count).ceil %>">»</a>
+    </li>
+  </ul>
 <% end %>

data/web/views/retries.erb

@@ -12,17 +12,19 @@
 <% if @retries.size > 0 %>
   <form action="<%= root_path %>retries" method="post">
     <table class="table table-striped table-bordered table-white">
-      <tr>
-        <th width="20px">
-          <input type="checkbox" class="check_all" />
-        </th>
-        <th width="25%"><%= t('NextRetry') %></th>
-        <th width="11%"><%= t('RetryCount') %></th>
-        <th><%= t('Queue') %></th>
-        <th><%= t('Worker') %></th>
-        <th><%= t('Arguments') %></th>
-        <th><%= t('Error') %></th>
-      </tr>
+      <thead>
+        <tr>
+          <th width="20px">
+            <input type="checkbox" class="check_all" />
+          </th>
+          <th width="25%"><%= t('NextRetry') %></th>
+          <th width="11%"><%= t('RetryCount') %></th>
+          <th><%= t('Queue') %></th>
+          <th><%= t('Worker') %></th>
+          <th><%= t('Arguments') %></th>
+          <th><%= t('Error') %></th>
+        </tr>
+      </thead>
       <% @retries.each do |msg, score| %>
         <tr>
           <td>
@@ -40,7 +42,7 @@
             <div class="args"><%= display_args(msg['args']) %></div>
           </td>
           <td>
-            <div><%= truncate("#{msg['error_class']}: #{msg['error_message']}") %></div>
+            <div><%= truncate("#{msg['error_class']}: #{msg['error_message']}", 200) %></div>
           </td>
         </tr>
       <% end %>

data/web/views/scheduled.erb

@@ -14,13 +14,15 @@
   <form action="<%= root_path %>scheduled" method="post">
     <table class="table table-striped table-bordered table-white">
       <thead>
-        <th width="20px">
-          <input type="checkbox" class="check_all" />
-        </th>
-        <th width="25%"><%= t('When') %></th>
-        <th width="10%"><%= t('Queue') %></th>
-        <th><%= t('Worker') %></th>
-        <th><%= t('Arguments') %></th>
+        <tr>
+          <th width="20px">
+            <input type="checkbox" class="check_all" />
+          </th>
+          <th width="25%"><%= t('When') %></th>
+          <th width="10%"><%= t('Queue') %></th>
+          <th><%= t('Worker') %></th>
+          <th><%= t('Arguments') %></th>
+        </tr>
       </thead>
       <% @scheduled.each do |msg, score| %>
         <tr>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.15.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis