Permalink
Browse files

Merge pull request #15 from akatz/fix_sinatra_base

Fix sinatra base
  • Loading branch information...
2 parents dd6401a + 5ff53b2 commit b3b94553eee1e8a85a918713fe56028d2cd3f338 @ejschmitt committed Jul 18, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 Gemfile
  2. +1 −1 lib/delayed_job_web/application/app.rb
View
@@ -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"
@@ -1,4 +1,4 @@
-require 'sinatra'
+require 'sinatra/base'
require 'active_support'
require 'active_record'
require 'delayed_job'

0 comments on commit b3b9455

Please sign in to comment.