Skip to content

Commit

Permalink
Merge 0c53866 into 4bb7f17
Browse files Browse the repository at this point in the history
  • Loading branch information
Charlie Somerville committed Mar 18, 2014
2 parents 4bb7f17 + 0c53866 commit b6b6d67
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions lib/lotus/controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ module Lotus
# end
module Controller
include Utils::ClassAttribute
include Dsl

# Global handled exceptions.
# When an handled exception is raised during #call execution, it will be
Expand Down Expand Up @@ -59,12 +60,6 @@ module Controller
# Show.new.call({id: 1}) # => [404, {}, ['Not Found']]
class_attribute :handled_exceptions
self.handled_exceptions = {}

def self.included(base)
base.class_eval do
include Dsl
end
end
end
end

0 comments on commit b6b6d67

Please sign in to comment.