Skip to content

Commit

Permalink
Remove duplicated responder configs and include from api
Browse files Browse the repository at this point in the history
ActionController::Rendering already includes
AbstractController::Rendering and we had duplicated respond_to calls
in basecontroller and controller_setup
  • Loading branch information
huoxito committed Oct 19, 2013
1 parent 546dd18 commit ae23991
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
4 changes: 0 additions & 4 deletions api/app/controllers/spree/api/base_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ class BaseController < ActionController::Metal
include ::ActionController::Head
include ::ActionController::ConditionalGet

self.responder = Spree::Api::Responders::AppResponder

respond_to :json

attr_accessor :current_api_user

before_filter :set_content_type
Expand Down
1 change: 0 additions & 1 deletion api/lib/spree/api/controller_setup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ module Api
module ControllerSetup
def self.included(klass)
klass.class_eval do
include AbstractController::Rendering
include AbstractController::ViewPaths
include AbstractController::Callbacks
include AbstractController::Helpers
Expand Down

0 comments on commit ae23991

Please sign in to comment.