lib/shamu/rails/controller.rb in shamu-0.0.9 vs lib/shamu/rails/controller.rb in shamu-0.0.11

- old
+ new

@@ -14,11 +14,14 @@ extend ActiveSupport::Concern included do include Scorpion::Rails::Controller - helper_method :permit? - helper_method :current_user + # ActionController::API does not have #helper_method + if respond_to?( :helper_method ) + helper_method :permit? + helper_method :current_user + end end private # The currently logged in user. Must respond to #id when logged in.