diff options
| -rw-r--r-- | Gemfile | 7 | ||||
| -rw-r--r-- | actionpack/actionpack.gemspec | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 3 |
3 files changed, 10 insertions, 2 deletions
@@ -8,6 +8,13 @@ end gem "bcrypt-ruby", "~> 3.0.0" gem "jquery-rails" + +if ENV['JOURNEY'] + gem "journey", :path => ENV['JOURNEY'] +else + gem "journey", :git => "git://github.com/rails/journey" +end + # This needs to be with require false to avoid # it being automatically loaded by sprockets gem "uglifier", ">= 1.0.3", :require => false diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index 65b364f872..f1b7966b9c 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |s| s.add_dependency('i18n', '~> 0.6') s.add_dependency('rack', '~> 1.3.2') s.add_dependency('rack-test', '~> 0.6.1') - s.add_dependency('rack-mount', '~> 0.8.2') + s.add_dependency('journey', '~> 1.0.0') s.add_dependency('sprockets', '~> 2.0.0') s.add_dependency('erubis', '~> 2.7.0') diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 11228c597d..2067c187e7 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -1,4 +1,5 @@ -require 'rack/mount' +require 'journey/router' +require 'journey/backwards' require 'forwardable' require 'active_support/core_ext/object/blank' require 'active_support/core_ext/object/to_query' |