From d1ed79d29af40fd055562c9e4da6f9b758d92852 Mon Sep 17 00:00:00 2001
From: Nate Matykiewicz <natem@auctionedge.com>
Date: Mon, 5 Oct 2015 09:41:58 -0500
Subject: [PATCH 01/10] Add favicon of current status

---
 web/views/layout.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/views/layout.erb b/web/views/layout.erb
index 86447612..f7fdac20 100644
--- a/web/views/layout.erb
+++ b/web/views/layout.erb
@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <link href="<%= root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" />
     <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
+    <link rel="shortcut icon" type="image/png" href="<%= root_path %>images/status/<%= current_status %>.png" />
     <script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
     <script type="text/javascript" src="<%= root_path %>javascripts/locales/jquery.timeago.<%= locale %>.js"></script>
     <meta name="google" content="notranslate" />

From ca235206b944e0dcd7515e2c271a6f4e65513dd8 Mon Sep 17 00:00:00 2001
From: Nate Matykiewicz <natem@auctionedge.com>
Date: Mon, 5 Oct 2015 09:42:27 -0500
Subject: [PATCH 02/10] Update status indicators when polling

---
 web/assets/javascripts/application.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/web/assets/javascripts/application.js b/web/assets/javascripts/application.js
index 22faf2aa..dc55c416 100755
--- a/web/assets/javascripts/application.js
+++ b/web/assets/javascripts/application.js
@@ -58,9 +58,17 @@ function updatePage(url) {
       url: url,
       dataType: 'html'
     }).done(function (data) {
-      var $page = $(data).filter('#page')
+      $data = $(data)
+
+      var $page = $data.filter('#page')
       $('#page').replaceWith($page)
 
+      var $header_status = $data.find('.status')
+      $('.status').replaceWith($header_status)
+
+      var $favicon = $data.filter('link[rel$="icon"]')
+      $('link[rel$="icon"]').replaceWith($favicon)
+
       $("time").timeago()
     })
   }, parseInt(localStorage.timeInterval) || 2000);

From 4cbb92f1b90f515f372ce900dd14947d69862713 Mon Sep 17 00:00:00 2001
From: Nate Matykiewicz <natem@auctionedge.com>
Date: Mon, 5 Oct 2015 11:39:56 -0500
Subject: [PATCH 03/10] Use static favicon

---
 web/assets/images/favicon.ico         | Bin 0 -> 5430 bytes
 web/assets/javascripts/application.js |   3 ---
 web/views/layout.erb                  |   2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)
 create mode 100644 web/assets/images/favicon.ico

diff --git a/web/assets/images/favicon.ico b/web/assets/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f515e0fda7ad1d1f9928a9f4652eff1adfab4343
GIT binary patch
literal 5430
zcmc(jPe>I}6voF&Bt$ACTu5Yu6-0zWNVKq!h-e`pAt50VK`mNDM1%{IkZ4g7E?TsZ
z2qB4R6(JHWT17~UkcbEo35kdn(IO;Xzi+x{xZP&njN^lZuXFA>=R4=zKXYeZQB)VL
zi8gMG_-l*Kt&5@^(%SxvA7a0aZ5Km@$Xply8$}1PhkunyrOwdVIkFa90K>9rY`&rr
zPCZxz+sg1=-5I!JMQes}aHqk$&|Y-x_}`HYE8rw+1yB7~z|JCk;tqj&i$%W&#6M=X
zEJ;i^m<L*S?OzX=1mX{7@yt$)_GuYRfnM+ch$~E6Ts2ADGmm3jlj@~8hp+ityyR!_
z-m`r{?+3{m`}t%CAA#ji{3*~1be<Q1eDmO_&y|ktyz@VH`hDbAi$iY$H)R9LGXdH?
ze+OfoIjy~V=>m$|;_}CRJKtI4Ab1WoTMidzdpM47092cA3;qp0-*oIlpfQVYagtF~
zsjLRNXWGC)VE4?m_-?}B{rNS0ogU+747nX>&4$g7uJuTs3$xc!l0R8v^gBR3j93ld
zZ?;-XYQ%FyHUr%|>fuDK>lDdH-FvQnhvLx--+@K)=fzO(imU$#xh*fg)_!VUcJ;Lf
z`)Zv(FJDmqMqYfa{nWqY&A;?Jv}|8N{e`l5%JPEx-x#-)%~ggM)Yloz{RSvnhg|-9
zDD`e7<|<HK!||f|i^h>Vu8mwDa<KJzwbjG*FsAI7TzWU_emkuk8i%>CZ3Q-W$wy&K
z*)h4!y4-gy2V>h4-TnIhY6T0xdZ=anyDsk%GXC~JChu2teFHuL`hK$dv)1csB{}`O
z^(|w2_uKo=`m@?5yH{IVeClli_6?`pufQmH3Vs5s7s@HWK5;rn|C}8^CQFAmUZqZ0
z*B>X};;XEGtYm%lG7nPkBlVOu=g>~9zLk~lmy`ZHi|G1JPwo!%73~M{d268OU<}NG
ztbX(iod-!D;XJF2;b{(8x%CXTijUk04g;OhWe{?{V^goGzXj5IAhrR#24SvnJP`8X
z+{)m6#=bj@Pa6~G&t1>mB$x%d6O_mLn9JbrA?A%2XYrE5X&kfRZv@{wuGVy``6U@o
zIR7VPaz8p>a?bJf1O1Lm+m~@ar>_$~1FYwlzR%U@^Za{!KX#q<u%{+$I<p_Z5cmO<
zzsu*Ej=dhJhVI)VuBL49+>keb_19y(YLa-JsV0|8Yy86H=*{72KI;XGLtg?q3%fz1
z*{ez7toP*i3bvErKo(CN5YJn>;*e*6=6=zQV|!MPG`r<W^X1v#j=K8oibYTMC68MR
YKlS#5y{@+Q^slp4wubj#0slq)4en)v<^TWy

literal 0
HcmV?d00001

diff --git a/web/assets/javascripts/application.js b/web/assets/javascripts/application.js
index dc55c416..f151ed3a 100755
--- a/web/assets/javascripts/application.js
+++ b/web/assets/javascripts/application.js
@@ -66,9 +66,6 @@ function updatePage(url) {
       var $header_status = $data.find('.status')
       $('.status').replaceWith($header_status)
 
-      var $favicon = $data.filter('link[rel$="icon"]')
-      $('link[rel$="icon"]').replaceWith($favicon)
-
       $("time").timeago()
     })
   }, parseInt(localStorage.timeInterval) || 2000);
diff --git a/web/views/layout.erb b/web/views/layout.erb
index f7fdac20..b4d82dfc 100644
--- a/web/views/layout.erb
+++ b/web/views/layout.erb
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <link href="<%= root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" />
     <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
-    <link rel="shortcut icon" type="image/png" href="<%= root_path %>images/status/<%= current_status %>.png" />
+    <link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico" />
     <script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
     <script type="text/javascript" src="<%= root_path %>javascripts/locales/jquery.timeago.<%= locale %>.js"></script>
     <meta name="google" content="notranslate" />

From 242109e872090c1214ff848ea409c3e2de2d994f Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Mon, 12 Oct 2015 07:53:10 -0700
Subject: [PATCH 04/10] Don't allow delay usage on Sidekiq::Worker

---
 lib/sidekiq/worker.rb | 12 ++++++++++++
 test/test_api.rb      |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/sidekiq/worker.rb b/lib/sidekiq/worker.rb
index ebb87fb9..db3e6486 100644
--- a/lib/sidekiq/worker.rb
+++ b/lib/sidekiq/worker.rb
@@ -38,6 +38,18 @@ module Sidekiq
 
     module ClassMethods
 
+      def delay(*args)
+        raise ArgumentError, "Do not call .delay on a Sidekiq::Worker class, call .perform_async"
+      end
+
+      def delay_for(*args)
+        raise ArgumentError, "Do not call .delay_for on a Sidekiq::Worker class, call .perform_in"
+      end
+
+      def delay_until(*args)
+        raise ArgumentError, "Do not call .delay_until on a Sidekiq::Worker class, call .perform_at"
+      end
+
       def perform_async(*args)
         client_push('class' => self, 'args' => args)
       end
diff --git a/test/test_api.rb b/test/test_api.rb
index 6c03f1cf..86b6fff2 100644
--- a/test/test_api.rb
+++ b/test/test_api.rb
@@ -202,10 +202,10 @@ class TestApi < Sidekiq::Test
     end
 
     it 'unwraps delayed jobs' do
-      ApiWorker.delay.foo(1,2,3)
+      Sidekiq::Queue.delay.foo(1,2,3)
       q = Sidekiq::Queue.new
       x = q.first
-      assert_equal "TestApi::ApiWorker.foo", x.display_class
+      assert_equal "Sidekiq::Queue.foo", x.display_class
       assert_equal [1,2,3], x.display_args
     end
 

From e363a806e21e0cb14f3d5554a0b638ca84e28993 Mon Sep 17 00:00:00 2001
From: Samuel Molnar <molnar.samuel@gmail.com>
Date: Tue, 13 Oct 2015 17:53:36 +0200
Subject: [PATCH 05/10] Remove redundant enclosing tag messing up styling

---
 web/views/busy.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/views/busy.erb b/web/views/busy.erb
index aa9fbd86..fee12658 100644
--- a/web/views/busy.erb
+++ b/web/views/busy.erb
@@ -12,7 +12,6 @@
     </form>
   </div>
 </div>
-</div>
 
 <div class="table_container">
   <table class="processes table table-hover table-bordered table-striped table-white">

From bab1ab8bd38ec3b2d9ebe628526deb89788d482a Mon Sep 17 00:00:00 2001
From: Samuel Molnar <molnar.samuel@gmail.com>
Date: Tue, 13 Oct 2015 17:53:57 +0200
Subject: [PATCH 06/10] Make form button groups look bit better

---
 web/assets/stylesheets/application.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/assets/stylesheets/application.css b/web/assets/stylesheets/application.css
index a832143c..ec42ab9f 100755
--- a/web/assets/stylesheets/application.css
+++ b/web/assets/stylesheets/application.css
@@ -181,6 +181,10 @@ form .btn {
   margin-right: 5px;
 }
 
+form .btn-group .btn {
+  margin-right: 1px;
+}
+
 td form {
   margin-bottom: 0;
 }

From ff287dd0dbc4695dea1e07434b45d34f35f53284 Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Tue, 13 Oct 2015 09:11:50 -0700
Subject: [PATCH 07/10] 2.1.1 release

---
 Pro-Changes.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Pro-Changes.md b/Pro-Changes.md
index 0ff73314..97b08f0a 100644
--- a/Pro-Changes.md
+++ b/Pro-Changes.md
@@ -3,6 +3,12 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+2.1.1
+-----------
+
+- Make ShardSet lazier so Redis can first be initialized at startup. [#2603]
+
+
 2.1.0
 -----------
 

From 056444dc40c4951f6813ff87338722ad62775ef0 Mon Sep 17 00:00:00 2001
From: mhuggins <matt.huggins@gmail.com>
Date: Wed, 14 Oct 2015 14:50:10 -0600
Subject: [PATCH 08/10] Automatically check for sidekiq.yml.erb filename

---
 lib/sidekiq/cli.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/sidekiq/cli.rb b/lib/sidekiq/cli.rb
index 7313bddc..c062e8cf 100644
--- a/lib/sidekiq/cli.rb
+++ b/lib/sidekiq/cli.rb
@@ -346,7 +346,11 @@ module Sidekiq
         die 1
       end
       @parser.parse!(argv)
-      opts[:config_file] ||= 'config/sidekiq.yml' if File.exist?('config/sidekiq.yml')
+
+      %w[config/sidekiq.yml config/sidekiq.yml.erb].each do |filename|
+        opts[:config_file] ||= filename if File.exist?(filename)
+      end
+
       opts
     end
 

From d17318831da32273d968f051d708cf8f93456d0f Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Thu, 15 Oct 2015 14:16:39 -0700
Subject: [PATCH 09/10] Latest ent changes

---
 Ent-Changes.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Ent-Changes.md b/Ent-Changes.md
index 4690b9fe..b18df0c9 100644
--- a/Ent-Changes.md
+++ b/Ent-Changes.md
@@ -3,6 +3,12 @@ Sidekiq Enterprise Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+HEAD
+----------
+
+- Allow user-specified TTLs for rate limiters [#2607]
+- Paginate rate limiter index page [#2606]
+
 0.7.3
 ----------
 
@@ -11,7 +17,6 @@ Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how t
   rate limit errors.
 - Fix scalability issue with Limiter index page.
 
-
 0.7.2
 ----------
 
@@ -23,7 +28,6 @@ Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how t
 - Fix issue where unique scheduled jobs can't be enqueued upon schedule
   due to the existing unique lock. [#2499]
 
-
 0.7.0
 ----------
 

From 19501b27ef222dca0627aa6888b800805bd1f6aa Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Thu, 15 Oct 2015 15:35:40 -0700
Subject: [PATCH 10/10] release 0.7.4

---
 Ent-Changes.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Ent-Changes.md b/Ent-Changes.md
index b18df0c9..5e5bb1d8 100644
--- a/Ent-Changes.md
+++ b/Ent-Changes.md
@@ -3,9 +3,10 @@ Sidekiq Enterprise Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
-HEAD
+0.7.4
 ----------
 
+- Add additional check to prevent duplicate periodic job creation
 - Allow user-specified TTLs for rate limiters [#2607]
 - Paginate rate limiter index page [#2606]