will/cancan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #618 from spatil/master

Browse Source 
Check for defined ActionController::Base instead ActionController
This commit is contained in:
Ryan Bates
2012-06-19 10:41:14 -07:00
parent 7bf683d8f4 51702e0f7b
commit 33e33c584e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cancan/controller_additions.rb
View File

@@ -385,7 +385,7 @@ module CanCan
end end
end end
if defined? ActionController if defined? ActionController::Base
ActionController::Base.class_eval do ActionController::Base.class_eval do
include CanCan::ControllerAdditions include CanCan::ControllerAdditions
end end