Skip to content
This repository has been archived by the owner on Dec 12, 2021. It is now read-only.

Check for defined ActionController::Base instead ActionController #618

Merged
merged 1 commit into from Jun 19, 2012
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/cancan/controller_additions.rb
Expand Up @@ -382,7 +382,7 @@ def cannot?(*args)
end
end

if defined? ActionController
if defined? ActionController::Base
ActionController::Base.class_eval do
include CanCan::ControllerAdditions
end
Expand Down