./lib/dolt/sinatra/base.rb in dolt-0.11.0 vs ./lib/dolt/sinatra/base.rb in dolt-0.12.0

- old
+ new

@@ -1,8 +1,8 @@ # encoding: utf-8 #-- -# Copyright (C) 2012 Gitorious AS +# Copyright (C) 2012-2013 Gitorious AS # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. @@ -14,18 +14,16 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. #++ require "sinatra/base" -require "sinatra/async" require "dolt/sinatra/actions" module Dolt module Sinatra class Base < ::Sinatra::Base attr_reader :actions, :renderer include Dolt::Sinatra::Actions - register ::Sinatra::Async def initialize(actions, renderer) @actions = actions @renderer = renderer super()