Merge branch 'master' of github.com:mperham/sidekiq

wjossey · Sep 17, 2014 · 9ada6e6 · 9ada6e6
2 parents 11735df + fe9de6d
commit 9ada6e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/lib/sidekiq/web.rb b/lib/sidekiq/web.rb
@@ -133,14 +133,13 @@ def custom_tabs
     end
 
     get "/retries/:key" do
-      halt 404 unless params['key']
       @retry = Sidekiq::RetrySet.new.fetch(*parse_params(params['key'])).first
       redirect "#{root_path}retries" if @retry.nil?
       erb :retry
     end
 
     post '/retries' do
-      halt 404 unless params['key']
+      redirect request.path unless params['key']
 
       params['key'].each do |key|
         job = Sidekiq::RetrySet.new.fetch(*parse_params(key)).first
@@ -160,7 +159,6 @@ def custom_tabs
     end
 
     post "/retries/:key" do
-      halt 404 unless params['key']
       job = Sidekiq::RetrySet.new.fetch(*parse_params(params['key'])).first
       retry_or_delete_or_kill job, params if job
       redirect_with_query("#{root_path}retries")
@@ -174,14 +172,13 @@ def custom_tabs
     end
 
     get "/scheduled/:key" do
-      halt 404 unless params['key']
       @job = Sidekiq::ScheduledSet.new.fetch(*parse_params(params['key'])).first
       redirect "#{root_path}scheduled" if @job.nil?
       erb :scheduled_job_info
     end
 
     post '/scheduled' do
-      halt 404 unless params['key']
+      redirect request.path unless params['key']
 
       params['key'].each do |key|
         job = Sidekiq::ScheduledSet.new.fetch(*parse_params(key)).first

diff --git a/myapp/Gemfile b/myapp/Gemfile
@@ -11,7 +11,7 @@ end
 
 gem 'rails', '~> 4.1.1'
 gem 'sidekiq', :path => '..'
-gem 'capistrano'
+gem 'pry-byebug'
 
 # sidekiq-web dependencies
 gem 'sinatra'