Skip to content

Commit

Permalink
Merge pull request #29 from botandrose/master
Browse files Browse the repository at this point in the history
Relax haml compatibility to work with haml 4.0
  • Loading branch information
ejschmitt committed Mar 20, 2013
2 parents 8524721 + 0440ec5 commit b68ed2b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "http://rubygems.org"
gem "sinatra", '>= 0.9.2'
gem "haml", '~> 3.1.3'
gem "haml", '>= 3.1.3'
gem 'activerecord', '> 3.0.0'
gem 'delayed_job', '> 2.0.3'
gem 'rdoc'
Expand Down
6 changes: 3 additions & 3 deletions delayed_job_web.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Gem::Specification.new do |s|

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
s.add_runtime_dependency(%q<haml>, ["~> 3.1.3"])
s.add_runtime_dependency(%q<haml>, [">= 3.1.3"])
s.add_runtime_dependency(%q<activerecord>, ["> 3.0.0"])
s.add_runtime_dependency(%q<delayed_job>, ["> 2.0.3"])
s.add_runtime_dependency(%q<rdoc>, [">= 0"])
Expand All @@ -69,7 +69,7 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<rack-test>, [">= 0"])
else
s.add_dependency(%q<sinatra>, [">= 0.9.2"])
s.add_dependency(%q<haml>, ["~> 3.1.3"])
s.add_dependency(%q<haml>, [">= 3.1.3"])
s.add_dependency(%q<activerecord>, ["> 3.0.0"])
s.add_dependency(%q<delayed_job>, ["> 2.0.3"])
s.add_dependency(%q<rdoc>, [">= 0"])
Expand All @@ -81,7 +81,7 @@ Gem::Specification.new do |s|
end
else
s.add_dependency(%q<sinatra>, [">= 0.9.2"])
s.add_dependency(%q<haml>, ["~> 3.1.3"])
s.add_dependency(%q<haml>, [">= 3.1.3"])
s.add_dependency(%q<activerecord>, ["> 3.0.0"])
s.add_dependency(%q<delayed_job>, ["> 2.0.3"])
s.add_dependency(%q<rdoc>, [">= 0"])
Expand Down

0 comments on commit b68ed2b

Please sign in to comment.