Skip to content
Browse files

point rails at Journey for dev and edge

  • Loading branch information...
1 parent ea7ef95 commit 68ec26c70c38c388822a7acd8682ac97d0d43b5e @tenderlove tenderlove committed Sep 12, 2011
View
2 railties/lib/rails/generators/app_base.rb
@@ -138,10 +138,12 @@ def rails_gemfile_entry
if options.dev?
<<-GEMFILE.strip_heredoc
gem 'rails', :path => '#{Rails::Generators::RAILS_DEV_PATH}'
+ gem 'journey', :path => '#{Rails::Generators::JOURNEY_DEV_PATH}'
GEMFILE
elsif options.edge?
<<-GEMFILE.strip_heredoc
gem 'rails', :git => 'git://github.com/rails/rails.git'
+ gem 'journey', :git => 'git://github.com/rails/journey.git'
GEMFILE
else
<<-GEMFILE.strip_heredoc
View
1 railties/lib/rails/generators/rails/app/app_generator.rb
@@ -139,6 +139,7 @@ module Generators
# We need to store the RAILS_DEV_PATH in a constant, otherwise the path
# can change in Ruby 1.8.7 when we FileUtils.cd.
RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
+ JOURNEY_DEV_PATH = File.expand_path("../../../../../../../journey", File.dirname(__FILE__))
RESERVED_NAMES = %w[application destroy benchmarker profiler plugin runner test]

0 comments on commit 68ec26c

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