aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-10-20 00:38:20 +0200
committerJosé Valim <jose.valim@gmail.com>2011-10-20 00:38:58 +0200
commit4e9729df3f03ee16445082b7d386ee14b4370461 (patch)
treeee2ba69c3d96d091af6ba365c49683cd17224067
parentbe27bf17e309fcb43fab45cfa1d31cea074a6a72 (diff)
downloadrails-4e9729df3f03ee16445082b7d386ee14b4370461.tar.gz
rails-4e9729df3f03ee16445082b7d386ee14b4370461.tar.bz2
rails-4e9729df3f03ee16445082b7d386ee14b4370461.zip
Don't use :path in Gemfile for --dev except for Rails.
-rw-r--r--railties/lib/rails/generators/app_base.rb2
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb2
2 files changed, 1 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 134d86fab0..40961f0c3e 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -138,7 +138,7 @@ module Rails
if options.dev?
<<-GEMFILE.strip_heredoc
gem 'rails', :path => '#{Rails::Generators::RAILS_DEV_PATH}'
- gem 'journey', :path => '#{Rails::Generators::JOURNEY_DEV_PATH}'
+ gem 'journey', :git => 'git://github.com/rails/journey.git'
GEMFILE
elsif options.edge?
<<-GEMFILE.strip_heredoc
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index c8648d19f8..3e32f758a4 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -144,8 +144,6 @@ module Rails
# 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]
class AppGenerator < AppBase