kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Switching rack-mount to journey.

Browse source
This commit is contained in:
Aaron Patterson 2011-09-08 10:51:23 -07:00
parent 1a421ceccb
commit 5f0b37c486
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Gemfile
View file

@ -8,6 +8,13 @@ end
gem "bcrypt-ruby", "~> 3.0.0" gem "bcrypt-ruby", "~> 3.0.0"
gem "jquery-rails" 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 # This needs to be with require false to avoid
# it being automatically loaded by sprockets # it being automatically loaded by sprockets
gem "uglifier", ">= 1.0.3", :require => false gem "uglifier", ">= 1.0.3", :require => false

2
actionpack/actionpack.gemspec
View file

@ -23,7 +23,7 @@ Gem::Specification.new do |s|
s.add_dependency('i18n', '~> 0.6') s.add_dependency('i18n', '~> 0.6')
s.add_dependency('rack', '~> 1.3.2') s.add_dependency('rack', '~> 1.3.2')
s.add_dependency('rack-test', '~> 0.6.1') 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('sprockets', '~> 2.0.0')
s.add_dependency('erubis', '~> 2.7.0') s.add_dependency('erubis', '~> 2.7.0')

3
actionpack/lib/action_dispatch/routing/route_set.rb
View file

@ -1,4 +1,5 @@
require 'rack/mount' require 'journey/router'
require 'journey/backwards'
require 'forwardable' require 'forwardable'
require 'active_support/core_ext/object/blank' require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/object/to_query' require 'active_support/core_ext/object/to_query'