Merge pull request #15 from akatz/fix_sinatra_base

Fix sinatra base
ejschmitt · Jul 18, 2012 · b3b9455 · b3b9455
2 parents dd6401a + 5ff53b2
commit b3b9455
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ source "http://rubygems.org"
 
 group :development do
   gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", "> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
   gem "rack-test", ">= 0"

diff --git a/lib/delayed_job_web/application/app.rb b/lib/delayed_job_web/application/app.rb
@@ -1,4 +1,4 @@
-require 'sinatra'
+require 'sinatra/base'
 require 'active_support'
 require 'active_record'
 require 'delayed_job'