Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/tpope/resources_controller …
Browse files Browse the repository at this point in the history
…into tpope
  • Loading branch information
ianwhite committed Nov 20, 2008
2 parents 74345d6 + 60b5f27 commit 9d8e9c1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/ardes/resources_controller/include_actions.rb
Expand Up @@ -16,7 +16,7 @@ module IncludeActions
def include_actions(controller, options = {})
options.assert_valid_keys(:only, :except)
raise ArgumentError, "you can only specify either :except or :only, not both" if options[:only] && options[:except]
mixin = self.dup
mixin = self.clone
action_methods_to_remove(options).each {|a| mixin.remove_action_method(a) }
controller.send :include, mixin
end
Expand All @@ -36,4 +36,4 @@ def action_methods_to_remove(options = {})
end
end
end
end
end

0 comments on commit 9d8e9c1

Please sign in to comment.