Merge pull request #79 from jdatti/master

all controllers should be extending ResqueWeb::ApplicationController ins...
resque · Mar 16, 2015 · e45e9c4 · e45e9c4
2 parents 962b5b0 + af66a10
commit e45e9c4
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/app/controllers/resque_web/failures_controller.rb b/app/controllers/resque_web/failures_controller.rb
@@ -1,5 +1,5 @@
 module ResqueWeb
-  class FailuresController < ApplicationController
+  class FailuresController < ResqueWeb::ApplicationController
 
     # Display all jobs in the failure queue
     #

diff --git a/app/controllers/resque_web/overview_controller.rb b/app/controllers/resque_web/overview_controller.rb
@@ -1,5 +1,5 @@
 module ResqueWeb
-  class OverviewController < ApplicationController
+  class OverviewController < ResqueWeb::ApplicationController
     def show
       render :layout => !request.xhr?, :locals => { :polling => request.xhr? }
     end

diff --git a/app/controllers/resque_web/queues_controller.rb b/app/controllers/resque_web/queues_controller.rb
@@ -1,5 +1,5 @@
 module ResqueWeb
-  class QueuesController < ApplicationController
+  class QueuesController < ResqueWeb::ApplicationController
 
     def index
     end

diff --git a/app/controllers/resque_web/stats_controller.rb b/app/controllers/resque_web/stats_controller.rb
@@ -1,5 +1,5 @@
 module ResqueWeb
-  class StatsController < ApplicationController
+  class StatsController < ResqueWeb::ApplicationController
     subtabs :resque, :redis, :keys
 
     def index

diff --git a/app/controllers/resque_web/workers_controller.rb b/app/controllers/resque_web/workers_controller.rb
@@ -1,5 +1,5 @@
 module ResqueWeb
-  class WorkersController < ApplicationController
+  class WorkersController < ResqueWeb::ApplicationController
     before_filter :display_subtabs
 
     def index

diff --git a/app/controllers/resque_web/working_controller.rb b/app/controllers/resque_web/working_controller.rb
@@ -1,5 +1,5 @@
 module ResqueWeb
-  class WorkingController < ApplicationController
+  class WorkingController < ResqueWeb::ApplicationController
 
     def index
     end