diff --git a/lib/skyline/engine.rb b/lib/skyline/engine.rb index 01e38ce..442444d 100644 --- a/lib/skyline/engine.rb +++ b/lib/skyline/engine.rb @@ -74,20 +74,3 @@ class Engine < Rails::Engine end end - -module ActionDispatch - module Routing - class RouteSet - def clear! - if Rails::VERSION::MAJOR != 3 || Rails::VERSION::MINOR != 2 || Rails::VERSION::TINY > 11 - raise "Bugfix for version 3.2.9 - 3.2.11 only!" - end - @finalized = false - named_routes.clear - set.clear - formatter.clear - @prepend.each { |blk| eval_block(blk) } - end - end - end -end \ No newline at end of file diff --git a/skylinecms.gemspec b/skylinecms.gemspec index c1b2061..0a9ab31 100644 --- a/skylinecms.gemspec +++ b/skylinecms.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |s| s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") s.add_dependency "thor" - s.add_dependency "rails", "~> 3.2.2" + s.add_dependency "rails", "~> 3.2.13" s.add_dependency "polyglot", "0.3.3" s.add_dependency "sprockets", "~> 2.2.1" s.add_dependency "mime-types", "1.19" @@ -39,7 +39,7 @@ Gem::Specification.new do |s| s.add_dependency "guid", "0.1.1" s.add_dependency "will_paginate", "~> 3.0.0" s.add_dependency "seed-fu", "2.2.0" - s.add_dependency "mail", "~>2.4.1" + s.add_dependency "mail", ">= 2.4.1" s.add_dependency "personify", "~> 1.1.0" s.add_dependency 'omniauth', "~> 1.1.0" s.add_dependency "bcrypt-ruby", "~> 3.0.1"