Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Switching rack-mount to journey.

  • Loading branch information...
commit 5f0b37c486dcc735b5817852932e761f5ff60152 1 parent 1a421ce
Aaron Patterson tenderlove authored
7 Gemfile
View
@@ -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
2  actionpack/actionpack.gemspec
View
@@ -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')
3  actionpack/lib/action_dispatch/routing/route_set.rb
View
@@ -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'

1 comment on commit 5f0b37c

Sam Granieri

Just for curiosity, what's the reason for the switch?

Please sign in to comment.
Something went wrong with that request. Please try again.